Use HAVE_UNISTD_H.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9503 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/ChangeLog b/src/ChangeLog
index d51bef56b704b1083ede20205e7d0e2374b2d90c..0dc5809cebff9e509ac6b6a8326604d12bf89aa5 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-19  Asger Ottar Alstrup  <aalstrup@laerdal.dk>
+
+       * buffer.C (readHeader): use "&&" rather than "and".
+
+       * lyxserver.h (inPipeName, outPipeName): make these const.
+
 2005-01-19  Angus Leeming  <leeming@lyx.org>
 
        * lyx_main.C (error_handler, init): protect SIGHUP with

diff --git a/src/buffer.C b/src/buffer.C
index 1118531a99dd4400b375141cb1eff996781bc889..4a7de29cb7d8a012bf1c50b53017dc4cda2ce57a 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -417,7 +417,7 @@ int Buffer::readHeader(LyXLex & lex)
 
                string unknown = params().readToken(lex, token);
                if (!unknown.empty()) {
-                       if (unknown[0] != '\\' and token == "\\textclass") {
+                       if (unknown[0] != '\\' && token == "\\textclass") {
                                unknownClass(unknown);
                        } else {
                                ++unknown_tokens;

diff --git a/src/client/ChangeLog b/src/client/ChangeLog
index 8417fe70cf837aae94982af7512827da0ce12aaf..f41cbd4053397db5674a08bfc36372b9a2b94abc 100644 (file)
--- a/src/client/ChangeLog
+++ b/src/client/ChangeLog
@@ -1,3 +1,7 @@
+2005-01-19  Asger Ottar Alstrup  <aalstrup@laerdal.dk>
+
+       * client.C: use the HAVE_UNISTD_H preprocessor guard.
+
 2005-01-10  Angus Leeming  <leeming@lyx.org>
 
        * messages.C: use support/package.h to provide the paths to the

diff --git a/src/client/client.C b/src/client/client.C
index 8339c1fe598b0aadc3ca4346fd1ae2006fd57bc9..adf9b41e87f4472f61322aa16db070ecd5c1e7c5 100644 (file)
--- a/src/client/client.C
+++ b/src/client/client.C
@@ -21,7 +21,9 @@
 
 // getpid(), getppid()
 #include <sys/types.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 
 // select()
 #include <sys/select.h>

diff --git a/src/frontends/ChangeLog b/src/frontends/ChangeLog
index f6941bdc93bfccddae7085e3674d265cb891e9d0..128e54265ea3a5de323579b59ed0a6423a4b6dd6 100644 (file)
--- a/src/frontends/ChangeLog
+++ b/src/frontends/ChangeLog
@@ -1,3 +1,6 @@
+2005-01-19  Asger Ottar Alstrup  <aalstrup@laerdal.dk>
+
+       * LyXView.C: use the HAVE_UNISTD_H preprocessor guard.
 
 2005-01-10  André Pönitz  <poenitz@gmx.net>
 

diff --git a/src/frontends/LyXView.C b/src/frontends/LyXView.C
index a8d33b65f7b7804647e8b217842f49ad0ffda909..e0d5a70a047029558899039876081528477ff886 100644 (file)
--- a/src/frontends/LyXView.C
+++ b/src/frontends/LyXView.C
@@ -40,7 +40,9 @@
 #include <boost/bind.hpp>
 
 #include <sys/time.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 
 using lyx::support::MakeDisplayPath;
 using lyx::support::OnlyFilename;

diff --git a/src/lyxserver.h b/src/lyxserver.h
index eb36be249476f93441cf34ca79d4551297390dc9..af08be2b5cf999fe443d0a3f596a4f377c1ac087 100644 (file)
--- a/src/lyxserver.h
+++ b/src/lyxserver.h
@@ -58,13 +58,13 @@ public:
 
 private:
        /// the filename of the in pipe
-       std::string const inPipeName() {
-               return pipename + ".in";
+       std::string const inPipeName() const {
+               return pipename + std::string(".in");
        }
 
        /// the filename of the out pipe
-       std::string const outPipeName() {
-               return pipename + ".out";
+       std::string const outPipeName() const {
+               return pipename + std::string(".out");
        }
 
        /// Open pipes

diff --git a/src/support/ChangeLog b/src/support/ChangeLog
index 9cfea8e07a1668d075a5d4b80be4db2dc3faf132..8b544f7d072b952d7ed01efcaf69e2a8ee4b1b0e 100644 (file)
--- a/src/support/ChangeLog
+++ b/src/support/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-19  Asger Ottar Alstrup  <aalstrup@laerdal.dk>
+
+       * lyxsum.C, socktools.C, tempname.C, userinfo.C: use the
+       HAVE_UNISTD_H preprocessor guard.
+
 2005-01-17  Angus Leeming  <leeming@lyx.org>
 
        * os_win32.C (init): Add Ruurd's original code to close the

diff --git a/src/support/lyxsum.C b/src/support/lyxsum.C
index d34b2215f3104445a284db62f8543f221311bd44..046188b8ca66edd84dfb7f219e2dd07547dd389c 100644 (file)
--- a/src/support/lyxsum.C
+++ b/src/support/lyxsum.C
@@ -42,7 +42,9 @@ template struct boost::detail::crc_table_t<32, 0x04C11DB7, true>;
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <sys/mman.h>
 
 

diff --git a/src/support/socktools.C b/src/support/socktools.C
index 4b4edd60f4ddd50a76ab68619993db5171092411..1142cb69bcd2bf78002ecccf4d7862bc55135baf 100644 (file)
--- a/src/support/socktools.C
+++ b/src/support/socktools.C
@@ -18,7 +18,9 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <fcntl.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 
 #include <cerrno>
 

diff --git a/src/support/tempname.C b/src/support/tempname.C
index 9e78525b82f43961bac7f848273412d92e45ae3d..e92639e35830335d41cd90c2b3e4089feb08269e 100644 (file)
--- a/src/support/tempname.C
+++ b/src/support/tempname.C
@@ -21,7 +21,9 @@
 #include <boost/scoped_array.hpp>
 
 #include <cstdlib>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 
 #if !defined(HAVE_MKSTEMP) && defined(HAVE_MKTEMP)
 # include <fcntl.h>

diff --git a/src/support/userinfo.C b/src/support/userinfo.C
index 0225f5d29de592417463c119635978415768562a..b45797287fa85743ec9bd90b2669c5dc2ee75f60 100644 (file)
--- a/src/support/userinfo.C
+++ b/src/support/userinfo.C
@@ -16,7 +16,9 @@
 #include <boost/assert.hpp>
 
 #include <pwd.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <sys/types.h>
 
 using std::string;