guard inclusion of <process.h> by G_OS_WIN32 add include <string.h> if the

2001-03-18  Sven Neumann  <sven@gimp.org>

	* tools/pdbgen/app.pl: guard inclusion of <process.h> by G_OS_WIN32
	* tools/pdbgen/lib.pl: add include <string.h> if the generated code
	used memcpy().

	* tools/pdbgen/pdb/fileops.pdb: include process.h for G_OS_WIN32.

	* libgimp/gimpbrushes_pdb.c
	* libgimp/gimpdrawable_pdb.c
	* libgimp/gimpgradients_pdb.c
	* libgimp/gimpgradientselect_pdb.c
	* libgimp/gimpimage_pdb.c
	* libgimp/gimppaths_pdb.c
	* libgimp/gimppatterns_pdb.c
	* libgimp/gimpproceduraldb_pdb.c
	* tools/pdbgen/pdb/fileops.pdb: regenerated

ChangeLog

@@ -1,3 +1,21 @@
+2001-03-18  Sven Neumann  <sven@gimp.org>
+
+	* tools/pdbgen/app.pl: guard inclusion of <process.h> by G_OS_WIN32
+	* tools/pdbgen/lib.pl: add include <string.h> if the generated code
+	used memcpy().
+	
+	* tools/pdbgen/pdb/fileops.pdb: include process.h for G_OS_WIN32.
+
+	* libgimp/gimpbrushes_pdb.c
+	* libgimp/gimpdrawable_pdb.c
+	* libgimp/gimpgradients_pdb.c
+	* libgimp/gimpgradientselect_pdb.c
+	* libgimp/gimpimage_pdb.c
+	* libgimp/gimppaths_pdb.c
+	* libgimp/gimppatterns_pdb.c
+	* libgimp/gimpproceduraldb_pdb.c
+	* tools/pdbgen/pdb/fileops.pdb: regenerated
+
 2001-03-16  Hans Breuer  <hans@breuer.org>
 
 	* plug-ins/common/gqbist.c : #define PATH_MAX as _MAX_PATH

app/pdb/fileops_cmds.c

@@ -20,6 +20,12 @@
 
 #include "config.h"
 
+#include <glib.h>
+
+#ifdef G_OS_WIN32
+#include <process.h>
+#endif
+
 #include <string.h>
 #include <sys/types.h>
 
@@ -30,10 +36,6 @@
 
 #include <gtk/gtk.h>
 
-#ifdef G_OS_WIN32
-#include <process.h>		/* For _getpid() */
-#endif
-
 #include "apptypes.h"
 #include "procedural_db.h"
 

libgimp/gimpbrushes_pdb.c

@@ -21,6 +21,8 @@
 
 /* NOTE: This file is autogenerated by pdbgen.pl */
 
+#include <string.h>
+
 #include "gimp.h"
 
 /**

libgimp/gimpdrawable_pdb.c

@@ -21,6 +21,8 @@
 
 /* NOTE: This file is autogenerated by pdbgen.pl */
 
+#include <string.h>
+
 #include "gimp.h"
 
 /**

libgimp/gimpgradients_pdb.c

@@ -21,6 +21,8 @@
 
 /* NOTE: This file is autogenerated by pdbgen.pl */
 
+#include <string.h>
+
 #include "gimp.h"
 
 /**

libgimp/gimpgradientselect_pdb.c

@@ -21,6 +21,8 @@
 
 /* NOTE: This file is autogenerated by pdbgen.pl */
 
+#include <string.h>
+
 #include "gimp.h"
 
 /**

libgimp/gimpimage_pdb.c

@@ -21,6 +21,8 @@
 
 /* NOTE: This file is autogenerated by pdbgen.pl */
 
+#include <string.h>
+
 #include "gimp.h"
 
 /**

libgimp/gimppaths_pdb.c

@@ -20,7 +20,8 @@
  */
 
 /* NOTE: This file is autogenerated by pdbgen.pl */
-#include <string.h> /* memcmp */
+
+#include <string.h>
 
 #include "gimp.h"
 

libgimp/gimppatterns_pdb.c

@@ -21,6 +21,8 @@
 
 /* NOTE: This file is autogenerated by pdbgen.pl */
 
+#include <string.h>
+
 #include "gimp.h"
 
 /**

libgimp/gimpproceduraldb_pdb.c

@@ -21,6 +21,8 @@
 
 /* NOTE: This file is autogenerated by pdbgen.pl */
 
+#include <string.h>
+
 #include "gimp.h"
 
 /**

tools/pdbgen/app.pl

@@ -691,8 +691,14 @@ GPL
 	foreach (@headers) {
 	    if ($_ eq '<unistd.h>') {
 		$headers .= "\n" if $seen;
-		$headers .= "#ifdef HAVE_UNISTD_H\n";
+		$headers .= "#ifdef HAVE_UNISTD_H\n";	
 	    }
+	    if ($_ eq '<process.h>') {
+		$headers .= "\n" if $seen;
+		$headers .= "#include <glib.h>\n\n";	
+		$headers .= "#ifdef G_OS_WIN32\n";
+	    }
+
 
 	    $seen++ if /^</;
 
@@ -730,6 +736,12 @@ GPL
 		$seen = 0;
  	    }
 
+            if ($_ eq '<process.h>') {
+		$headers .= "#endif\n\n";
+		$seen = 0;
+	    }
+            
+
 	    $headers .= "\n" if $_ eq '"config.h"';
 	}
 

tools/pdbgen/lib.pl

@@ -325,6 +325,7 @@ CP1
       memcpy ($var, return_vals[$argc].data.d_$type,
 	      $numvar * sizeof ($datatype));
 CP2
+		    $out->{headers} = "#include <string.h>\n" if (!($ch || $cf));
                 }
 		else {
 		    # The return value variable
@@ -599,6 +600,7 @@ HEADER
         print CFILE $lgpl_top;
         print CFILE " * $cname\n";
         print CFILE $lgpl_bottom;
+	print CFILE $out->{headers}, "\n" if exists $out->{headers};
 	print CFILE qq/#include "gimp.h"\n/;
 	print CFILE qq/#include "gimpprivate.h"\n/ if $privatevars;
 	print CFILE "\n", $extra->{code} if exists $extra->{code};

tools/pdbgen/pdb/fileops.pdb

@@ -274,7 +274,7 @@ HELP
     );
 
     %invoke = (
-	headers => [ qw("gimprc.h") ],
+	headers => [ qw(<process.h> "gimprc.h") ],
 	vars => [ 'static gint id = 0', 'static gint pid' ],
 	code => <<'CODE'
 {