(PrintPS::begin): Change isspace to g_ascii_isspace.

print.cpp, extension/internal/ps.cpp: Fix some #includes.

diff --git a/src/extension/internal/ps.cpp b/src/extension/internal/ps.cpp
index ac424e85eb62a7ccc5e4900bd58e4ef0b8cd8094..3210f723c20e943e7875ed26efb23ee92889f130 100644 (file)
--- a/src/extension/internal/ps.cpp
+++ b/src/extension/internal/ps.cpp
@@ -34,6 +34,7 @@
 #include <libnr/n-art-bpath.h>
 
 #include <glib/gmem.h>
+#include <glib/gstrfuncs.h>
 #include <gtk/gtkstock.h>
 #include <gtk/gtkvbox.h>
 #include <gtk/gtkframe.h>
@@ -69,12 +70,26 @@
 #include <string>
 #include <iostream>
 #include <fstream>
-
-#ifdef SOLARIS_2_8
-#include <unistd.h>
-#endif
-
-using namespace std;
+#include <cstring>
+#include <cstdio>
+#include <cstdlib>
+#include <cmath>
+using std::atof;
+using std::ceil;
+using std::fclose;
+using std::ferror;
+using std::fflush;
+using std::fgetc;
+using std::fprintf;
+using std::fputc;
+using std::fseek;
+using std::ifstream;
+using std::ios;
+using std::memset;
+using std::strchr;
+using std::strcmp;
+using std::strerror;
+using std::tmpfile;
 
 namespace Inkscape {
 namespace Extension {
@@ -277,7 +292,7 @@ PrintPS::begin(Inkscape::Extension::Print *mod, SPDocument *doc)
     if (fn != NULL) {
         if (*fn == '|') {
             fn += 1;
-            while (isspace(*fn)) fn += 1;
+            while (g_ascii_isspace(*fn)) fn += 1;
 #ifndef WIN32
             osp = popen(fn, "w");
 #else

diff --git a/src/print.cpp b/src/print.cpp
index dad80d1c979425f0af313485b236016c9e5da892..fe395851eab63239802c420a8172327c7b461830 100644 (file)
--- a/src/print.cpp
+++ b/src/print.cpp
@@ -22,13 +22,12 @@
 #include "print.h"
 
 #ifdef HAVE_GTK_UNIX_PRINT
-#include <gtk/gtk.h>
-#include <glibmm/i18n.h>
-#include <gtk/gtkprintunixdialog.h>
-#endif
-
-#ifdef SOLARIS_2_8
-#include <unistd.h>
+# include <gtk/gtk.h>
+# include <glibmm/i18n.h>
+# include <gtk/gtkprintunixdialog.h>
+# include <unistd.h>   // close, unlink
+# include <cstdio>
+using std::fprintf;
 #endif
 
 #if 0