After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 140115 - conflicting declarations in app/paint-funcs/paint-funcs.h
conflicting declarations in app/paint-funcs/paint-funcs.h
Status: RESOLVED FIXED
Product: GIMP
Classification: Other
Component: General
2.0.x
Other Linux
: High trivial
: 2.0
Assigned To: GIMP Bugs
GIMP Bugs
: 141112 143558 143808 144187 (view as bug list)
Depends on:
Blocks:
 
 
Reported: 2004-04-15 03:54 UTC by Guido Trentalancia
Modified: 2004-06-11 23:11 UTC
See Also:
GNOME target: ---
GNOME version: 2.3/2.4

Attachments
proposed patch for app/paint-funcs/paint-funcs.h (504 bytes, patch)
2004-04-15 03:55 UTC, Guido Trentalancia 		none Details | Review

Description Guido Trentalancia 2004-04-15 03:54:18 UTC 
When compiling (using gcc 3.4.0 from cvs), I get an error message about
conflicting declarations. Please use the patch below.

This is a patch:

--- paint-funcs.h.old   2004-04-15 05:49:33.999984792 +0100
+++ paint-funcs.h       2004-04-15 05:45:50.054029752 +0100
@@ -356,7 +356,7 @@
                                           gint,
                                            GimpLayerModeEffects,
                                            gboolean *,
-                                           CombinationMode);
+                                           InitialMode);
  
 void  combine_regions                     (PixelRegion *, PixelRegion *,
                                           PixelRegion *, PixelRegion *,
Comment 1 Guido Trentalancia 2004-04-15 03:55:18 UTC 
Created attachment 26675 [details] [review]
proposed patch for app/paint-funcs/paint-funcs.h

Please confirm.
Comment 2 Sven Neumann 2004-04-15 11:29:37 UTC 
This header sucks so badly :( Yes, your patch looks correct.
Comment 3 Sven Neumann 2004-04-15 12:38:21 UTC 
Fixed in the HEAD branch by a more general cleanup:

2004-04-15  Sven Neumann  <sven@gimp.org>

	* app/paint-funcs/paint-funcs.[ch]: 
	* app/paint-funcs/paint-funcs-generic.h: header cleanup, added
	some const qualifiers, converted tabs to spaces. Fixes bug #140115
	for the HEAD branch.

For the stable branch, we should simply apply the patch.
Comment 4 Sven Neumann 2004-04-15 12:42:37 UTC 
Applied the patch in the gimp-2-0 branch:
 
2004-04-15  Sven Neumann  <sven@gimp.org>

	* app/paint-funcs/paint-funcs.h: fixed declaration of
	initial_region() (bug #140115).
Comment 5 Sven Neumann 2004-04-30 00:06:08 UTC 
*** Bug 141112 has been marked as a duplicate of this bug. ***
Comment 6 Sven Neumann 2004-06-02 10:10:12 UTC 
*** Bug 143558 has been marked as a duplicate of this bug. ***
Comment 7 Sven Neumann 2004-06-06 15:09:00 UTC 
*** Bug 143808 has been marked as a duplicate of this bug. ***
Comment 8 Sven Neumann 2004-06-11 23:11:38 UTC 
*** Bug 144187 has been marked as a duplicate of this bug. ***