unistd_if_available.diff (3,920 bytes)
cvs -Q diff -u (in directory E:\Scribus For Windows\scribus-1.3.x-cvs\Scribus\)
cvs diff: Empty password used - try 'cvs login' with a real password
Index: scribus/fileunzip.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/fileunzip.cpp,v
retrieving revision 1.1.2.3
diff -u -r1.1.2.3 fileunzip.cpp
--- scribus/fileunzip.cpp 1 Jul 2005 16:51:38 -0000 1.1.2.3
+++ scribus/fileunzip.cpp 5 Jul 2005 15:57:23 -0000
@@ -32,7 +32,10 @@
#include <sys/stat.h>
#endif
+#ifdef HAVE_UNISTD_H
# include <unistd.h>
+#endif
+
# include <utime.h>
#include <iostream>
Index: scribus/filewatcher.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/Attic/filewatcher.cpp,v
retrieving revision 1.1.2.3
diff -u -r1.1.2.3 filewatcher.cpp
--- scribus/filewatcher.cpp 13 Jan 2005 22:07:11 -0000 1.1.2.3
+++ scribus/filewatcher.cpp 5 Jul 2005 15:57:23 -0000
@@ -1,6 +1,11 @@
#include "filewatcher.h"
#include "filewatcher.moc"
+
+#include "scconfig.h"
+
+#ifdef HAVE_UNISTD_H
#include <unistd.h>
+#endif
FileWatcher::FileWatcher( QWidget* parent) : QObject(parent)
{
Index: scribus/gtgettext.h
===================================================================
RCS file: /cvs/Scribus/scribus/gtgettext.h,v
retrieving revision 1.2.2.7
diff -u -r1.2.2.7 gtgettext.h
--- scribus/gtgettext.h 5 Jul 2005 06:36:03 -0000 1.2.2.7
+++ scribus/gtgettext.h 5 Jul 2005 16:02:57 -0000
@@ -21,7 +21,6 @@
#ifndef GTGETTEXT_H
#define GTGETTEXT_H
-#include <dlfcn.h>
#include <iostream>
#include <vector>
Index: scribus/scimage.h
===================================================================
RCS file: /cvs/Scribus/scribus/Attic/scimage.h,v
retrieving revision 1.1.2.12
diff -u -r1.1.2.12 scimage.h
--- scribus/scimage.h 5 Jul 2005 06:36:03 -0000 1.1.2.12
+++ scribus/scimage.h 5 Jul 2005 15:57:23 -0000
@@ -6,7 +6,9 @@
#include <setjmp.h>
#include <cstdlib>
#include <cmath>
+#ifdef HAVE_UNISTD_H
#include <unistd.h>
+#endif
#include <valarray>
#include <qimage.h>
#include <qstring.h>
Index: scribus/scribusview.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/scribusview.cpp,v
retrieving revision 1.76.2.231
diff -u -r1.76.2.231 scribusview.cpp
--- scribus/scribusview.cpp 5 Jul 2005 06:36:03 -0000 1.76.2.231
+++ scribus/scribusview.cpp 5 Jul 2005 16:09:18 -0000
@@ -34,7 +34,11 @@
#include <cmath>
#include <cstdio>
#include <cstdlib>
+
+#ifdef HAVE_UNISTD_H
#include <unistd.h>
+#endif
+
#include <qcursor.h>
#include <qurl.h>
#include <qdir.h>
Index: scribus/util.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/util.cpp,v
retrieving revision 1.52.2.93
diff -u -r1.52.2.93 util.cpp
--- scribus/util.cpp 5 Jul 2005 06:36:03 -0000 1.52.2.93
+++ scribus/util.cpp 5 Jul 2005 16:06:09 -0000
@@ -28,7 +28,13 @@
#include <algorithm>
#include <cstdlib>
#include <cmath>
+
+#include "scconfig.h"
+
+#ifdef HAVE_UNISTD_H
#include <unistd.h>
+#endif
+
#include "md5.h"
#include <setjmp.h>
#include "qprocess.h"
@@ -37,8 +43,6 @@
#include "prefscontext.h"
#include "prefstable.h"
-#include "scconfig.h"
-
extern PrefsFile *prefsFile;
extern "C"
Index: scribus/libpdf/pdflib.cpp
===================================================================
RCS file: /cvs/Scribus/scribus/libpdf/pdflib.cpp,v
retrieving revision 1.78.2.109
diff -u -r1.78.2.109 pdflib.cpp
--- scribus/libpdf/pdflib.cpp 5 Jul 2005 06:36:03 -0000 1.78.2.109
+++ scribus/libpdf/pdflib.cpp 5 Jul 2005 15:57:23 -0000
@@ -30,7 +30,9 @@
#include <qdir.h>
#include <cstdlib>
#include <cmath>
+#ifdef HAVE_UNISTD_H
#include <unistd.h>
+#endif
#include "rc4.h"
#include "pageitem.h"