Merge latest green inbound changeset and mozilla-central

This commit is contained in:
Ed Morley 2013-11-12 15:08:15 +00:00
commit e6fab74c1e
2 changed files with 10 additions and 2 deletions

View File

@ -8,7 +8,11 @@
interface nsIUDPSocketInternal;
%{ C++
#include "mozilla/net/DNS.h"
namespace mozilla {
namespace net {
union NetAddr;
}
}
%}
native NetAddr(mozilla::net::NetAddr);
[ptr] native NetAddrPtr(mozilla::net::NetAddr);

View File

@ -7,7 +7,11 @@
#include "nsISupports.idl"
%{ C++
#include "mozilla/net/DNS.h"
namespace mozilla {
namespace net {
union NetAddr;
}
}
%}
native NetAddr(mozilla::net::NetAddr);