X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/05b75f8d50b83e943af3be4071449304d82dbdcd..0720e8ef5c1d10373cd5faedd35eab2bc4e30fbf:/lib/common.h

diff --git a/lib/common.h b/lib/common.h
index 77a2cd9..9cf3892 100644
--- a/lib/common.h
+++ b/lib/common.h
@@ -1,21 +1,19 @@
 /*
  * 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
+ * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 /** @file lib/common.h
  * @brief Common includes and definitions
@@ -24,8 +22,15 @@
 #ifndef COMMON_H
 #define COMMON_H
 
-#include <config.h>
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
 
+# define SOCKET int
+# define INVALID_SOCKET (-1)
+# define declspec(x)
+# define socket_error() (errno)
+# define system_error() (errno)
 #if HAVE_INTTYPES_H
 # include <inttypes.h>
 #endif
@@ -112,6 +117,10 @@ typedef unsigned char uint32_t;
 # endif
 #endif
 
+#if !HAVE_CLOSESOCKET
+# define closesocket close
+#endif
+
 #endif /* COMMENT_H */
 
 /*