>From Asger's patch. Committing...

-- 
Angus
Index: src/client/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/client/ChangeLog,v
retrieving revision 1.11
diff -u -p -r1.11 ChangeLog
--- src/client/ChangeLog	19 Jan 2005 15:26:40 -0000	1.11
+++ src/client/ChangeLog	20 Jan 2005 15:31:03 -0000
@@ -1,3 +1,7 @@
+2005-01-20  Asger Ottar Alstrup  <[EMAIL PROTECTED]>
+
+	* pch.h: use the HAVE_UNISTD_H preprocessor guard.
+
 2005-01-19  Asger Ottar Alstrup  <[EMAIL PROTECTED]>
 
 	* client.C: use the HAVE_UNISTD_H preprocessor guard.
Index: src/client/client.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/client/client.C,v
retrieving revision 1.6
diff -u -p -r1.6 client.C
--- src/client/client.C	19 Jan 2005 15:26:40 -0000	1.6
+++ src/client/client.C	20 Jan 2005 15:31:04 -0000
@@ -22,7 +22,7 @@
 // getpid(), getppid()
 #include <sys/types.h>
 #ifdef HAVE_UNISTD_H
-#include <unistd.h>
+# include <unistd.h>
 #endif
 
 // select()
Index: src/client/pch.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/client/pch.h,v
retrieving revision 1.1
diff -u -p -r1.1 pch.h
--- src/client/pch.h	17 Sep 2004 08:26:41 -0000	1.1
+++ src/client/pch.h	20 Jan 2005 15:31:04 -0000
@@ -8,7 +8,9 @@
 #include <boost/scoped_ptr.hpp>
 
 #include <fcntl.h>
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
 
 #include <sys/select.h>
 #include <sys/socket.h>
Index: src/frontends/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/ChangeLog,v
retrieving revision 1.270
diff -u -p -r1.270 ChangeLog
--- src/frontends/ChangeLog	19 Jan 2005 15:26:41 -0000	1.270
+++ src/frontends/ChangeLog	20 Jan 2005 15:31:05 -0000
@@ -1,3 +1,7 @@
+2005-01-20  Asger Ottar Alstrup  <[EMAIL PROTECTED]>
+
+	* pch.h: use the HAVE_UNISTD_H preprocessor guard.
+
 2005-01-19  Asger Ottar Alstrup  <[EMAIL PROTECTED]>
 
 	* LyXView.C: use the HAVE_UNISTD_H preprocessor guard.
Index: src/frontends/LyXView.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/LyXView.C,v
retrieving revision 1.48
diff -u -p -r1.48 LyXView.C
--- src/frontends/LyXView.C	19 Jan 2005 15:26:41 -0000	1.48
+++ src/frontends/LyXView.C	20 Jan 2005 15:31:05 -0000
@@ -41,7 +41,7 @@
 
 #include <sys/time.h>
 #ifdef HAVE_UNISTD_H
-#include <unistd.h>
+# include <unistd.h>
 #endif
 
 using lyx::support::MakeDisplayPath;
Index: src/frontends/pch.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/pch.h,v
retrieving revision 1.2
diff -u -p -r1.2 pch.h
--- src/frontends/pch.h	26 Sep 2004 14:19:46 -0000	1.2
+++ src/frontends/pch.h	20 Jan 2005 15:31:05 -0000
@@ -8,7 +8,9 @@
 #include <boost/utility.hpp>
 
 #include <sys/time.h>
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
 
 #include <limits>
 #include <map>
Index: src/frontends/gnome/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/gnome/ChangeLog,v
retrieving revision 1.71
diff -u -p -r1.71 ChangeLog
--- src/frontends/gnome/ChangeLog	10 Jan 2005 19:17:40 -0000	1.71
+++ src/frontends/gnome/ChangeLog	20 Jan 2005 15:31:06 -0000
@@ -1,3 +1,7 @@
+2005-01-20  Asger Ottar Alstrup  <[EMAIL PROTECTED]>
+
+	* support.c: use the HAVE_UNISTD_H preprocessor guard.
+
 2005-01-10  Angus Leeming  <[EMAIL PROTECTED]>
 
 	* lyx_gui.C: use support/package.h to provide the paths to the
Index: src/frontends/gnome/support.c
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/gnome/support.c,v
retrieving revision 1.1
diff -u -p -r1.1 support.c
--- src/frontends/gnome/support.c	14 Aug 2000 09:44:52 -0000	1.1
+++ src/frontends/gnome/support.c	20 Jan 2005 15:31:06 -0000
@@ -8,7 +8,9 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
 #include <string.h>
 
 #include <gnome.h>
Index: src/support/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/ChangeLog,v
retrieving revision 1.311
diff -u -p -r1.311 ChangeLog
--- src/support/ChangeLog	20 Jan 2005 15:02:16 -0000	1.311
+++ src/support/ChangeLog	20 Jan 2005 15:31:10 -0000
@@ -1,3 +1,9 @@
+2005-01-20  Asger Ottar Alstrup  <[EMAIL PROTECTED]>
+
+	* FileInfo.h, chdir.C, forkedcall.C, forkedcontr.C, getcwd.C,
+	mkdir.C, os_defines.h, pch.h, rmdir.C, unlink.C:
+	use the HAVE_UNISTD_H preprocessor guard.
+
 2005-01-20  Angus Leeming  <[EMAIL PROTECTED]>
 
 	* filetools.[Ch] (LibScriptSearch): modify the code that replaces
Index: src/support/FileInfo.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/FileInfo.h,v
retrieving revision 1.29
diff -u -p -r1.29 FileInfo.h
--- src/support/FileInfo.h	15 Dec 2004 21:40:11 -0000	1.29
+++ src/support/FileInfo.h	20 Jan 2005 15:31:10 -0000
@@ -16,7 +16,9 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
 
 #include <ctime>
 #include <string>
Index: src/support/chdir.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/chdir.C,v
retrieving revision 1.9
diff -u -p -r1.9 chdir.C
--- src/support/chdir.C	7 Nov 2004 13:22:51 -0000	1.9
+++ src/support/chdir.C	20 Jan 2005 15:31:10 -0000
@@ -12,7 +12,9 @@
 
 #include "support/lyxlib.h"
 
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
 
 int lyx::support::chdir(std::string const & name)
 {
Index: src/support/forkedcall.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/forkedcall.C,v
retrieving revision 1.20
diff -u -p -r1.20 forkedcall.C
--- src/support/forkedcall.C	7 Nov 2004 13:22:51 -0000	1.20
+++ src/support/forkedcall.C	20 Jan 2005 15:31:11 -0000
@@ -42,7 +42,9 @@
 #include <cstdlib>
 #include <sys/types.h>
 #include <sys/wait.h>
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
 
 #include <vector>
 
Index: src/support/forkedcontr.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/forkedcontr.C,v
retrieving revision 1.26
diff -u -p -r1.26 forkedcontr.C
--- src/support/forkedcontr.C	4 Dec 2004 14:50:25 -0000	1.26
+++ src/support/forkedcontr.C	20 Jan 2005 15:31:11 -0000
@@ -23,7 +23,9 @@
 
 #include <cerrno>
 #include <cstdlib>
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
 #include <sys/wait.h>
 
 using boost::bind;
Index: src/support/getcwd.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/getcwd.C,v
retrieving revision 1.11
diff -u -p -r1.11 getcwd.C
--- src/support/getcwd.C	7 Nov 2004 13:22:51 -0000	1.11
+++ src/support/getcwd.C	20 Jan 2005 15:31:11 -0000
@@ -15,7 +15,9 @@
 #include <boost/scoped_array.hpp>
 
 #include <cerrno>
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
 
 using boost::scoped_array;
 
Index: src/support/lyxsum.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/lyxsum.C,v
retrieving revision 1.37
diff -u -p -r1.37 lyxsum.C
--- src/support/lyxsum.C	19 Jan 2005 15:26:41 -0000	1.37
+++ src/support/lyxsum.C	20 Jan 2005 15:31:11 -0000
@@ -43,7 +43,7 @@ template struct boost::detail::crc_table
 #include <sys/stat.h>
 #include <fcntl.h>
 #ifdef HAVE_UNISTD_H
-#include <unistd.h>
+# include <unistd.h>
 #endif
 #include <sys/mman.h>
 
Index: src/support/mkdir.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/mkdir.C,v
retrieving revision 1.15
diff -u -p -r1.15 mkdir.C
--- src/support/mkdir.C	16 Dec 2004 01:03:34 -0000	1.15
+++ src/support/mkdir.C	20 Jan 2005 15:31:11 -0000
@@ -15,7 +15,9 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <fcntl.h>
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
 
 int lyx::support::mkdir(std::string const & pathname, unsigned long int mode)
 {
Index: src/support/os2_defines.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/os2_defines.h,v
retrieving revision 1.3
diff -u -p -r1.3 os2_defines.h
--- src/support/os2_defines.h	25 Sep 2002 10:03:41 -0000	1.3
+++ src/support/os2_defines.h	20 Jan 2005 15:31:11 -0000
@@ -23,7 +23,9 @@ inline int readlink(const char *, char *
 #define readlink(s, t, l) (-1)
 #endif
 #include <process.h>
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
 #include <X11/Xlocale.h>
 /* #include <malloc.h> */
 #define lstat stat
Index: src/support/pch.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/pch.h,v
retrieving revision 1.4
diff -u -p -r1.4 pch.h
--- src/support/pch.h	26 Sep 2004 14:19:47 -0000	1.4
+++ src/support/pch.h	20 Jan 2005 15:31:11 -0000
@@ -21,7 +21,9 @@
 #include <sys/un.h>
 #include <sys/wait.h>
 #include <time.h>
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
 
 #include <algorithm>
 #include <cctype>
Index: src/support/rmdir.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/rmdir.C,v
retrieving revision 1.7
diff -u -p -r1.7 rmdir.C
--- src/support/rmdir.C	7 Nov 2004 13:22:51 -0000	1.7
+++ src/support/rmdir.C	20 Jan 2005 15:31:11 -0000
@@ -12,7 +12,9 @@
 
 #include "support/lyxlib.h"
 
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
 
 int lyx::support::rmdir(std::string const & dir)
 {
Index: src/support/socktools.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/socktools.C,v
retrieving revision 1.5
diff -u -p -r1.5 socktools.C
--- src/support/socktools.C	19 Jan 2005 15:26:41 -0000	1.5
+++ src/support/socktools.C	20 Jan 2005 15:31:11 -0000
@@ -19,7 +19,7 @@
 #include <sys/un.h>
 #include <fcntl.h>
 #ifdef HAVE_UNISTD_H
-#include <unistd.h>
+# include <unistd.h>
 #endif
 
 #include <cerrno>
Index: src/support/tempname.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/tempname.C,v
retrieving revision 1.24
diff -u -p -r1.24 tempname.C
--- src/support/tempname.C	19 Jan 2005 15:26:41 -0000	1.24
+++ src/support/tempname.C	20 Jan 2005 15:31:12 -0000
@@ -22,7 +22,7 @@
 
 #include <cstdlib>
 #ifdef HAVE_UNISTD_H
-#include <unistd.h>
+# include <unistd.h>
 #endif
 
 #if !defined(HAVE_MKSTEMP) && defined(HAVE_MKTEMP)
Index: src/support/unlink.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/unlink.C,v
retrieving revision 1.7
diff -u -p -r1.7 unlink.C
--- src/support/unlink.C	7 Nov 2004 13:22:51 -0000	1.7
+++ src/support/unlink.C	20 Jan 2005 15:31:12 -0000
@@ -12,7 +12,9 @@
 
 #include "support/lyxlib.h"
 
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
 
 int lyx::support::unlink(std::string const & pathname)
 {
Index: src/support/userinfo.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/userinfo.C,v
retrieving revision 1.8
diff -u -p -r1.8 userinfo.C
--- src/support/userinfo.C	19 Jan 2005 15:26:41 -0000	1.8
+++ src/support/userinfo.C	20 Jan 2005 15:31:12 -0000
@@ -17,7 +17,7 @@
 
 #include <pwd.h>
 #ifdef HAVE_UNISTD_H
-#include <unistd.h>
+# include <unistd.h>
 #endif
 #include <sys/types.h>
 

Reply via email to