pkg/25724: Difference between function declaration and definition prevents compilation of gimp with gcc 3.4.0

[shannonjr%netbsd.org@localhost]

>Number:         25724
>Category:       pkg
>Synopsis:       Difference between function declaration and definition 
>prevents compilation of gimp with gcc 3.4.0
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Thu May 27 10:23:00 UTC 2004
>Closed-Date:
>Last-Modified:
>Originator:     John R. Shannon
>Release:        NetBSD 2.0_BETA
>Organization:
        netbsd.org
>Environment:
System: NetBSD colleen.internal.johnrshannon.com 2.0_BETA NetBSD 2.0_BETA 
(KERNEL) #0: Mon May 24 05:31:10 MDT 2004 
root%colleen.internal.johnrshannon.com@localhost:/usr/obj/usr/src/sys/arch/i386/compile/KERNEL
 i386
Architecture: i386
Machine: i386
>Description:
        paint-funcs.c:4484: error: conflicting types for 'initial_region'
        paint-funcs.h:359: error: previous declaration of 'initial_region' was 
here

        The problem is that the parameter "type" is declared to be of type 
"CombinationMode"
        in the header file and "InitialMode" in the ".c" file.
>How-To-Repeat:
        Compile with wip/gcc-3.4
>Fix:


$NetBSD$

--- ./app/paint-funcs/paint-funcs.c.orig        2004-03-13 04:34:45.000000000 
-0700
+++ ./app/paint-funcs/paint-funcs.c
@@ -4480,7 +4480,7 @@ initial_region (PixelRegion            *src,
                gint                  opacity,
                GimpLayerModeEffects  mode,
                gboolean             *affect,
-               InitialMode           type)
+               CombinationMode       type)
 {
   struct initial_regions_struct st;
 
>Release-Note:
>Audit-Trail:
>Unformatted: