From 424ef32dfc4dab25adf90bd253d5778779a56c09 Mon Sep 17 00:00:00 2001
From: martin <martin@c6295689-39f2-0310-b995-f0e70906c6a9>
Date: Tue, 30 Nov 2010 11:22:38 +0000
Subject: [PATCH] libopensc: fix building new simclist with mingw

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@4897 c6295689-39f2-0310-b995-f0e70906c6a9
---
 src/common/simclist.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/common/simclist.c b/src/common/simclist.c
index f0dcff90..5da8a385 100644
--- a/src/common/simclist.c
+++ b/src/common/simclist.c
@@ -19,15 +19,21 @@
  * SimCList library. See http://mij.oltrelinux.com/devel/simclist
  */
 
-/* SimCList implementation, version 1.5 */
+/* SimCList implementation, version 1.5, with local modifications */
 
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>      /* for setting errno */
 #include <sys/types.h>
+#ifndef SIMCLIST_NO_DUMPRESTORE
 #include <sys/uio.h>    /* for READ_ERRCHECK() and write() */
 #include <fcntl.h>      /* for open() etc */
+#endif
+#if !defined(_WIN32)
 #include <arpa/inet.h>  /* for htons() */
+#else
+#include <winsock2.h>
+#endif
 #include <unistd.h>
 #include <time.h>       /* for time() for random seed */
 #include <sys/time.h>   /* for gettimeofday() */
@@ -37,7 +43,7 @@
 
 
 /* work around lack of inttypes.h support in broken Microsoft Visual Studio compilers */
-#if !defined(WIN32) || !defined(_MSC_VER)
+#if !defined(_WIN32) || !defined(_MSC_VER)
 #   include <inttypes.h>   /* (u)int*_t */
 #else
 #   include <basetsd.h>
@@ -178,6 +184,7 @@ static void *list_get_minmax(const list_t *restrict l, int versus);
 
 static inline struct list_entry_s *list_findpos(const list_t *restrict l, int posstart);
 
+#ifndef SIMCLIST_NO_DUMPRESTORE
 /* write() decorated with error checking logic */
 #define WRITE_ERRCHECK(fd, msgbuf, msglen)      do {                                                    \
                                                     if (write(fd, msgbuf, msglen) < 0) return -1;       \
@@ -189,6 +196,7 @@ static inline struct list_entry_s *list_findpos(const list_t *restrict l, int po
                                                         return -1;                                      \
                                                     }                                                   \
                                                 } while (0);
+#endif
 
 /*
  * Random Number Generator