Commit 5b210062 authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer
Browse files

app/plug_in_cmds.c app/procedural_db_cmds.c tools/pdbgen/pdb/plug_in.pdb

2001-01-03  Michael Natterer  <mitch@gimp.org>

	* app/plug_in_cmds.c
	* app/procedural_db_cmds.c
	* tools/pdbgen/pdb/plug_in.pdb
	* tools/pdbgen/pdb/procedural_db.pdb
	* tools/pdbgen/app.pl: conditionally include <regex.h> or
	"regexrepl.h", depending on HAVE_GLIBC_REGEX.
parent 65867d40
2001-01-03 Michael Natterer <mitch@gimp.org>
* app/plug_in_cmds.c
* app/procedural_db_cmds.c
* tools/pdbgen/pdb/plug_in.pdb
* tools/pdbgen/pdb/procedural_db.pdb
* tools/pdbgen/app.pl: conditionally include <regex.h> or
"regexrepl.h", depending on HAVE_GLIBC_REGEX.
2001-01-03 Daniel Egger <egger@suse.de>
* app/plug_in_cmds.c:
......@@ -404,7 +413,7 @@
* plug-ins/imagemap/imap_default_dialog.c
* plug-ins/imagemap/imap_file.c: these files used to include
"libgimp/gimpui.h" without including "libgimp/gimp.h". This is
no longer possible because the libgimpui headers don't inlcude
no longer possible because the libgimpui headers don't include
"libgimp/gimpunit.h" any more.
2000-12-29 Asbjorn Pettersen <asbjornP@dualog.no>
......
......@@ -30,7 +30,13 @@
#include "appenv.h"
#include "plug_in.h"
#include "regex.h"
#ifdef HAVE_GLIBC_REGEX
#include <regex.h>
#else
#include "regexrepl.h"
#endif
static ProcRecord progress_init_proc;
static ProcRecord progress_update_proc;
......
......@@ -29,7 +29,13 @@
#include "apptypes.h"
#include "procedural_db.h"
#include "regex.h"
#ifdef HAVE_GLIBC_REGEX
#include <regex.h>
#else
#include "regexrepl.h"
#endif
#include "libgimp/gimpintl.h"
......
......@@ -710,8 +710,19 @@ GPL
$headers .= "\n" if /libgimp/ && !$lib++ && $headers;
if ($_ eq '"regexrepl.h"') {
$headers .= "\n";
$headers .= "#ifdef HAVE_GLIBC_REGEX\n";
$headers .= "#include <regex.h>\n";
$headers .= "#else\n";
}
$headers .= "#include $_\n";
if ($_ eq '"regexrepl.h"') {
$headers .= "#endif\n\n";
}
if ($_ eq '<unistd.h>') {
$headers .= "#endif\n\n";
$seen = 0;
......
......@@ -333,7 +333,7 @@ CODE
}
@headers = qw("plug_in.h" "regex.h" "appenv.h" <string.h> <stdlib.h>);
@headers = qw("plug_in.h" "regexrepl.h" "appenv.h" <string.h> <stdlib.h>);
$extra{app}->{code} = <<'CODE';
static int
......
......@@ -180,7 +180,7 @@ HELP
);
%invoke = (
headers => [ qw(<stdlib.h> "regex.h") ],
headers => [ qw(<stdlib.h> "regexrepl.h") ],
vars => [ 'PDBQuery pdb_query' ],
code => <<CODE
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment