From f359a95a52c0c359cd2317f07fa70a65b5af0342 Mon Sep 17 00:00:00 2001
From: eku <eku@users.sourceforge.net>
Date: Mon, 26 Aug 2002 12:18:16 +0000
Subject: [PATCH] Added / replaced ifdef's around unistd.h with the define
 HAVE_UNISTD_H generated by autoconf.

---
 src/burp/mvol.cpp               | 2 +-
 src/jrd/isc_file.cpp            | 2 ++
 src/jrd/jrd.cpp                 | 2 ++
 src/jrd/llio.cpp                | 2 +-
 src/jrd/os/posix/mod_loader.cpp | 2 ++
 src/jrd/thd.cpp                 | 2 +-
 src/jrd/y-valve.cpp             | 6 ++++--
 src/remote/xnet.cpp             | 2 ++
 src/utilities/srvrmgr.cpp       | 4 +++-
 src/wal/walw.cpp                | 2 +-
 10 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/burp/mvol.cpp b/src/burp/mvol.cpp
index 1a1543735c..574fc80480 100644
--- a/src/burp/mvol.cpp
+++ b/src/burp/mvol.cpp
@@ -51,7 +51,7 @@
 #if (defined WIN_NT || (defined PC_PLATFORM && !defined NETWARE_386))
 #include <io.h>
 #endif
-#ifdef unix
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
diff --git a/src/jrd/isc_file.cpp b/src/jrd/isc_file.cpp
index 031a7838c2..c7b7042baa 100644
--- a/src/jrd/isc_file.cpp
+++ b/src/jrd/isc_file.cpp
@@ -185,7 +185,9 @@ typedef struct mnt {
 /* Unix specific stuff */
 
 #ifdef UNIX
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <sys/types.h>
 #include <sys/ipc.h>
 #include <sys/file.h>
diff --git a/src/jrd/jrd.cpp b/src/jrd/jrd.cpp
index 3a2f46f792..d762625ac1 100644
--- a/src/jrd/jrd.cpp
+++ b/src/jrd/jrd.cpp
@@ -40,7 +40,9 @@
 #include "../jrd/common.h"
 #include <stdarg.h>
 #ifndef	WIN_NT
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #ifdef DARWIN
 #include </usr/include/pwd.h>
 #else
diff --git a/src/jrd/llio.cpp b/src/jrd/llio.cpp
index 1131bd8fca..382489f716 100644
--- a/src/jrd/llio.cpp
+++ b/src/jrd/llio.cpp
@@ -66,7 +66,7 @@
 #  endif
 #endif
 
-#ifdef sparc
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
diff --git a/src/jrd/os/posix/mod_loader.cpp b/src/jrd/os/posix/mod_loader.cpp
index 9cec820ee8..ccf448a9c7 100644
--- a/src/jrd/os/posix/mod_loader.cpp
+++ b/src/jrd/os/posix/mod_loader.cpp
@@ -5,7 +5,9 @@
 
 #include "../jrd/os/mod_loader.h"
 #include "../../common.h"
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <dlfcn.h>
diff --git a/src/jrd/thd.cpp b/src/jrd/thd.cpp
index a20407ea78..d5419bb72f 100644
--- a/src/jrd/thd.cpp
+++ b/src/jrd/thd.cpp
@@ -52,7 +52,7 @@ extern int BeginThread(void (*__func) (void *), void *__stackP,
 #define STACK_SIZE	128000
 #endif
 
-#ifdef UNIX
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
diff --git a/src/jrd/y-valve.cpp b/src/jrd/y-valve.cpp
index 5c84237822..f1111e6435 100644
--- a/src/jrd/y-valve.cpp
+++ b/src/jrd/y-valve.cpp
@@ -27,7 +27,7 @@
  *
  */
 /*
-$Id: y-valve.cpp,v 1.4 2002-04-04 11:37:14 dimitr Exp $
+$Id: y-valve.cpp,v 1.5 2002-08-26 12:18:12 eku Exp $
 */
 
 #include "firebird.h"
@@ -81,9 +81,11 @@ $Id: y-valve.cpp,v 1.4 2002-04-04 11:37:14 dimitr Exp $
 #include <errno.h>
 #include <fcntl.h>
 #if !(defined SEEK_END && defined F_OK)
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 #endif
+#endif
 
 #ifdef WIN_NT
 #include <windows.h>
@@ -6253,4 +6255,4 @@ BOOLEAN WHY_get_shutdown()
 #endif /* SERVER_SHUTDOWN && !SUPERCLIENT && !REQUESTER */
 
 
-} // extern "C"
\ No newline at end of file
+} // extern "C"
diff --git a/src/remote/xnet.cpp b/src/remote/xnet.cpp
index 36c9789dc2..c762c932a2 100644
--- a/src/remote/xnet.cpp
+++ b/src/remote/xnet.cpp
@@ -54,7 +54,9 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <errno.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <sys/param.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
diff --git a/src/utilities/srvrmgr.cpp b/src/utilities/srvrmgr.cpp
index ee85984951..3b44779855 100644
--- a/src/utilities/srvrmgr.cpp
+++ b/src/utilities/srvrmgr.cpp
@@ -20,7 +20,7 @@
  *
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
- * $Id: srvrmgr.cpp,v 1.3 2001-12-24 02:50:53 tamlin Exp $
+ * $Id: srvrmgr.cpp,v 1.4 2002-08-26 12:18:12 eku Exp $
  */
 
 #include "firebird.h"
@@ -28,7 +28,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <sys/types.h>
 #include <sys/wait.h>
 
diff --git a/src/wal/walw.cpp b/src/wal/walw.cpp
index 921637a820..a3ad5b882d 100644
--- a/src/wal/walw.cpp
+++ b/src/wal/walw.cpp
@@ -71,7 +71,7 @@
 #include <signal.h>
 #endif
 
-#ifdef sparc
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif