disorder.h: more consistent approach to function attributes

[disorder] / lib / common.h

diff --git a/lib/common.h b/lib/common.h
index 2ca41a69b88852f3572200e0ccea36a2acd20495..6c90fd6aad0cb4f405075184b349e3e6f2dbb2cc 100644 (file)
--- a/lib/common.h
+++ b/lib/common.h
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder.
- * Copyright (C) 2004, 2005, 2007, 2008 Richard Kettlewell
+ * Copyright (C) 2004, 2005, 2007, 2008, 2013 Richard Kettlewell
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,7 +22,20 @@
 #ifndef COMMON_H
 #define COMMON_H
 
-#include <config.h>
+#if HAVE_CONFIG_H
+# 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>
@@ -110,6 +123,18 @@ 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
+
 #endif /* COMMENT_H */
 
 /*