dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Applied a bunch of small changes contributed by Tim Mooney that fix stack 

2004-07-30  Sven Neumann  <sven@gimp.org>

	Applied a bunch of small changes contributed by Tim Mooney that fix
	stack corruption on Tru64 and Aix (bug #129867).

	* app/Makefile.am
	* plug-ins/script-fu/Makefile.am: changed the dependency order so
	that $(REGEXREPL) is linked earlier.

	* regexrepl/regex.[ch]: fixed check for __STDC__, merged upstream
	fix for re_max_failures value.
This commit is contained in:
Sven Neumann 2004-07-30 20:56:29 +00:00 committed by Sven Neumann
parent 26a4b20dfe
commit fc2485e6f7
5 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
2004-07-30 Sven Neumann <sven@gimp.org>
Applied a bunch of small changes contributed by Tim Mooney that fix
stack corruption on Tru64 and Aix (bug #129867).
* app/Makefile.am
* plug-ins/script-fu/Makefile.am: changed the dependency order so
that $(REGEXREPL) is linked earlier.
* regexrepl/regex.[ch]: fixed check for __STDC__, merged upstream
fix for re_max_failures value.
2004-07-30 Sven Neumann <sven@gimp.org> 2004-07-30 Sven Neumann <sven@gimp.org>
* configure.in: always do the check for perl and use the * configure.in: always do the check for perl and use the

8
app/Makefile.am
View File

@ -125,6 +125,7 @@ gimp_2_1_LDADD = \
$(libgimpthumb) \ $(libgimpthumb) \
$(libgimpmath) \ $(libgimpmath) \
$(libgimpbase) \ $(libgimpbase) \
$(REGEXREPL) \
$(GTK_LIBS) \ $(GTK_LIBS) \
$(LIBART_LIBS) \ $(LIBART_LIBS) \
$(PANGOFT2_LIBS) \ $(PANGOFT2_LIBS) \
@ -133,8 +134,7 @@ gimp_2_1_LDADD = \
$(GIMP_THREAD_LIBS) \ $(GIMP_THREAD_LIBS) \
$(GIMP_MP_LIBS) \ $(GIMP_MP_LIBS) \
$(RT_LIBS) \ $(RT_LIBS) \
$(INTLLIBS) \ $(INTLLIBS)
$(REGEXREPL)
if ENABLE_GIMP_CONSOLE if ENABLE_GIMP_CONSOLE
@ -168,6 +168,7 @@ gimp_console_2_1_LDADD = \
$(libgimpthumb) \ $(libgimpthumb) \
$(libgimpmath) \ $(libgimpmath) \
$(libgimpbase) \ $(libgimpbase) \
$(REGEXREPL) \
$(GDK_PIXBUF_LIBS) \ $(GDK_PIXBUF_LIBS) \
$(LIBART_LIBS) \ $(LIBART_LIBS) \
$(PANGOFT2_LIBS) \ $(PANGOFT2_LIBS) \
@ -176,8 +177,7 @@ gimp_console_2_1_LDADD = \
$(GIMP_THREAD_LIBS) \ $(GIMP_THREAD_LIBS) \
$(GIMP_MP_LIBS) \ $(GIMP_MP_LIBS) \
$(RT_LIBS) \ $(RT_LIBS) \
$(INTLLIBS) \ $(INTLLIBS)
$(REGEXREPL)
endif endif

4
plug-ins/script-fu/Makefile.am
View File

@ -54,8 +54,8 @@ LDADD = \
$(libgimpcolor) \ $(libgimpcolor) \
$(libgimpbase) \ $(libgimpbase) \
siod/libsiod.a \ siod/libsiod.a \
$(REGEXREPL) \
$(GTK_LIBS) \ $(GTK_LIBS) \
$(SOCKET_LIBS) \ $(SOCKET_LIBS) \
$(RT_LIBS) \ $(RT_LIBS) \
$(INTLLIBS) \ $(INTLLIBS)
$(REGEXREPL)

4
regexrepl/regex.c
View File

@ -215,7 +215,7 @@ init_syntax_once ()
machines, compilers, `char' and `unsigned char' argument types. machines, compilers, `char' and `unsigned char' argument types.
(Per Bothner suggested the basic approach.) */ (Per Bothner suggested the basic approach.) */
#undef SIGN_EXTEND_CHAR #undef SIGN_EXTEND_CHAR
#if __STDC__ #if defined(__STDC__)
#define SIGN_EXTEND_CHAR(c) ((signed char) (c)) #define SIGN_EXTEND_CHAR(c) ((signed char) (c))
#else /* not __STDC__ */ #else /* not __STDC__ */
/* As in Harbison and Steele. */ /* As in Harbison and Steele. */
@ -1064,7 +1064,7 @@ typedef struct
#if defined (MATCH_MAY_ALLOCATE) #if defined (MATCH_MAY_ALLOCATE)
/* 4400 was enough to cause a crash on Alpha OSF/1, /* 4400 was enough to cause a crash on Alpha OSF/1,
whose default stack limit is 2mb. */ whose default stack limit is 2mb. */
int re_max_failures = 20000; int re_max_failures = 4000;
#else #else
int re_max_failures = 2000; int re_max_failures = 2000;
#endif #endif

2
regexrepl/regex.h
View File

@ -426,7 +426,7 @@ typedef struct
unfortunately clutters up the declarations a bit, but I think it's unfortunately clutters up the declarations a bit, but I think it's
worth it. */ worth it. */
#if __STDC__ #if defined(__STDC__)
#define _RE_ARGS(args) args #define _RE_ARGS(args) args