diff options
| author | Peter Moulder <peter.moulder@monash.edu> | 2007-09-12 05:15:53 +0000 |
|---|---|---|
| committer | pjrm <pjrm@users.sourceforge.net> | 2007-09-12 05:15:53 +0000 |
| commit | d14db7c6e6185a3b0819d35f6fe2b9c5c4958e58 (patch) | |
| tree | 089dacd2d27c08301381ca942de5a533c59a9dde /src | |
| parent | Preserve current zoom and view for reverted documents (diff) | |
| download | inkscape-d14db7c6e6185a3b0819d35f6fe2b9c5c4958e58.tar.gz inkscape-d14db7c6e6185a3b0819d35f6fe2b9c5c4958e58.zip | |
(PrintPS::begin): Change isspace to g_ascii_isspace.
print.cpp, extension/internal/ps.cpp: Fix some #includes.
(bzr r3725)
Diffstat (limited to 'src')
| -rw-r--r-- | src/extension/internal/ps.cpp | 29 | ||||
| -rw-r--r-- | src/print.cpp | 13 |
2 files changed, 28 insertions, 14 deletions
diff --git a/src/extension/internal/ps.cpp b/src/extension/internal/ps.cpp index ac424e85e..3210f723c 100644 --- 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 dad80d1c9..fe395851e 100644 --- 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 |