r18747 - gnucash/trunk - More header include compatibility: Watch out for HAVE_UNISTD_H.

[Christian Stimming]

Author: cstim
Date: 2010-02-27 13:38:52 -0500 (Sat, 27 Feb 2010)
New Revision: 18747
Trac: http://svn.gnucash.org/trac/changeset/18747

Modified:
   gnucash/trunk/.gitignore
   gnucash/trunk/src/backend/xml/gnc-backend-xml.c
   gnucash/trunk/src/backend/xml/io-example-account.c
   gnucash/trunk/src/backend/xml/io-gncxml-v2.c
   gnucash/trunk/src/libqof/qof/md5.c
Log:
More header include compatibility: Watch out for HAVE_UNISTD_H.

Modified: gnucash/trunk/.gitignore
===================================================================
--- gnucash/trunk/.gitignore	2010-02-27 16:32:01 UTC (rev 18746)
+++ gnucash/trunk/.gitignore	2010-02-27 18:38:52 UTC (rev 18747)
@@ -125,3 +125,4 @@
 src/bin/gnucash-bin.o
 gnucash-*.*.*/
 gnucash-*.*.*.tar.*
+build*

Modified: gnucash/trunk/src/backend/xml/gnc-backend-xml.c
===================================================================
--- gnucash/trunk/src/backend/xml/gnc-backend-xml.c	2010-02-27 16:32:01 UTC (rev 18746)
+++ gnucash/trunk/src/backend/xml/gnc-backend-xml.c	2010-02-27 18:38:52 UTC (rev 18747)
@@ -39,10 +39,18 @@
 #include <limits.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#else
+# ifdef _MSC_VER
+typedef int ssize_t;
+# endif
+#endif
 #include <errno.h>
 #include <string.h>
-#include <dirent.h>
+#ifdef HAVE_DIRENT_H
+# include <dirent.h>
+#endif
 #include <time.h>
 
 #include "qof.h"

Modified: gnucash/trunk/src/backend/xml/io-example-account.c
===================================================================
--- gnucash/trunk/src/backend/xml/io-example-account.c	2010-02-27 16:32:01 UTC (rev 18746)
+++ gnucash/trunk/src/backend/xml/io-example-account.c	2010-02-27 18:38:52 UTC (rev 18747)
@@ -26,10 +26,14 @@
 
 #include <sys/types.h>
 #include <ctype.h>
-#include <dirent.h>
+#ifdef HAVE_DIRENT_H
+# include <dirent.h>
+#endif
 #include <string.h>
 #include <sys/stat.h>
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
 
 #include <glib.h>
 #include <glib/gi18n.h>

Modified: gnucash/trunk/src/backend/xml/io-gncxml-v2.c
===================================================================
--- gnucash/trunk/src/backend/xml/io-gncxml-v2.c	2010-02-27 16:32:01 UTC (rev 18746)
+++ gnucash/trunk/src/backend/xml/io-gncxml-v2.c	2010-02-27 18:38:52 UTC (rev 18747)
@@ -25,7 +25,9 @@
 #include <glib/gstdio.h>
 #include <fcntl.h>
 #include <string.h>
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
 #include <zlib.h>
 #include <errno.h>
 

Modified: gnucash/trunk/src/libqof/qof/md5.c
===================================================================
--- gnucash/trunk/src/libqof/qof/md5.c	2010-02-27 16:32:01 UTC (rev 18746)
+++ gnucash/trunk/src/libqof/qof/md5.c	2010-02-27 18:38:52 UTC (rev 18747)
@@ -32,7 +32,7 @@
 #else
 # ifndef HAVE_MEMCPY
 #include <string.h>
-#  define memcpy(d, s, n) bcopy ((s), (d), (n))
+/* #  define memcpy(d, s, n) bcopy ((s), (d), (n)) */
 # endif
 #endif