Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/disorder

[disorder] / lib / common.h

diff --git a/lib/common.h b/lib/common.h
index 9cf38921a86a4060a5804faa21e97ac7c895144d..6c90fd6aad0cb4f405075184b349e3e6f2dbb2cc 100644 (file)
--- a/lib/common.h
+++ b/lib/common.h
@@ -26,11 +26,17 @@
 # include <config.h>
 #endif
 
+#if _WIN32
+# include "disorder-win32.h"
+#else
 # define SOCKET int
 # define INVALID_SOCKET (-1)
 # define declspec(x)
 # define socket_error() (errno)
 # define system_error() (errno)
+# define network_init()
+#endif
+
 #if HAVE_INTTYPES_H
 # include <inttypes.h>
 #endif
@@ -117,6 +123,14 @@ typedef unsigned char uint32_t;
 # endif
 #endif
 
+#if ! HAVE_UINT16_T
+# if USHRT_MAX == 65535
+typedef unsigned short uint16_t;
+# else
+#  error cannot determine uint16_t
+# endif
+#endif
+
 #if !HAVE_CLOSESOCKET
 # define closesocket close
 #endif