non-unified-build.patch (1274B)
1 diff --git a/src/net/nr_socket_wrapper.c b/src/net/nr_socket_wrapper.c 2 index 0c9ec5674407d..4ad59527c12ec 100644 3 --- a/src/net/nr_socket_wrapper.c 4 +++ b/src/net/nr_socket_wrapper.c 5 @@ -36,6 +36,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 6 #include <nr_api.h> 7 #include "nr_socket_wrapper.h" 8 9 +#include <assert.h> 10 + 11 int nr_socket_wrapper_factory_create_int(void *obj, nr_socket_wrapper_factory_vtbl *vtbl, 12 nr_socket_wrapper_factory **wrapperp) 13 { 14 diff --git a/src/net/transport_addr.h b/nICEr/src/net/transport_addr.h 15 index c75c70a1d94fa..1783d2e4506a8 100644 16 --- a/src/net/transport_addr.h 17 +++ b/src/net/transport_addr.h 18 @@ -38,7 +38,22 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 19 #include <stdbool.h> 20 #include <sys/types.h> 21 #ifdef WIN32 22 + 23 +// FIXME: This is dangerous, but exactly the pattern used in 24 +// nrappkit/src/port/win32/include/csi_platform.h 25 +// Not good because INT8 are typedefed to different values in 26 +// <winsock2.h> and <r_types.h>. 27 +// { 28 + 29 +#define UINT8 UBLAH_IGNORE_ME_PLEASE 30 +#define INT8 BLAH_IGNORE_ME_PLEASE 31 #include <winsock2.h> 32 +#undef UINT8 33 +#undef INT8 34 +#include <r_types.h> 35 + 36 +// } 37 + 38 #include <ws2tcpip.h> 39 #else 40 #include <sys/socket.h>