pkg/37497: glib2 patches for solaris 10/suncc

[heas%shrubbery.net@localhost]

>Number:         37497
>Category:       pkg
>Synopsis:       glib2 patches for solaris 10/suncc
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Fri Dec 07 21:10:00 +0000 2007
>Originator:     john heasley
>Release:        NetBSD 4.99.9
>Organization:
        
>Environment:
        
        
System: solaris 10 u4 ga
Architecture: sparc64
Machine: sparc64
>Description:
The macros like:
        #define IN_HEADER defined
anger sunstudio 12/spro, which claims:
"galiasdef.c", line 3447: warning: non-portable use of "defined" operator in 
macro   

And, POSIX_SOURCE requires _STDC_C99 according to sys/feature_tests.h.
>How-To-Repeat:
        
>Fix:

$NetBSD$

--- glib/galias.h.orig  2007-11-24 16:31:35.000000000 +0000
+++ glib/galias.h
@@ -7,7 +7,7 @@
 #ifdef G_HAVE_GNUC_VISIBILITY
 
 #define IN_FILE(x) 1
-#define IN_HEADER defined
+#define IN_HEADER(x) (x##___X != ___X)
 
 #if IN_HEADER(__G_ARRAY_H__)
 #if IN_FILE(__G_ARRAY_C__)

--- glib/galiasdef.c.orig       2007-11-24 16:31:35.000000000 +0000
+++ glib/galiasdef.c
@@ -7,7 +7,7 @@
 #ifdef G_HAVE_GNUC_VISIBILITY
 
 #undef IN_FILE
-#define IN_FILE defined
+#define IN_FILE(x) (x##___X != ___X)
 
 #undef IN_HEADER
 #define IN_HEADER(x) 1

--- gobject/gobjectaliasdef.c.orig      2007-11-24 16:31:41.000000000 +0000
+++ gobject/gobjectaliasdef.c
@@ -7,7 +7,7 @@
 #ifdef G_HAVE_GNUC_VISIBILITY
 
 #undef IN_FILE
-#define IN_FILE defined
+#define IN_FILE(x) (x##___X != ___X)
 
 #undef IN_HEADER
 #define IN_HEADER(x) 1

--- gobject/gobjectalias.h.orig 2007-11-24 16:31:41.000000000 +0000
+++ gobject/gobjectalias.h
@@ -7,7 +7,7 @@
 #ifdef G_HAVE_GNUC_VISIBILITY
 
 #define IN_FILE(x) 1
-#define IN_HEADER defined
+#define IN_HEADER(x) (x##___X != ___X)
 
 #if IN_HEADER(__G_BOXED_H__)
 #if IN_FILE(__G_BOXED_C__)

Index: patches/patch-aj
===================================================================
RCS file: /cvsroot/pkgsrc/devel/glib2/patches/patch-aj,v
retrieving revision 1.4
diff -u -r1.4 patch-aj
--- patches/patch-aj    24 Mar 2007 20:58:20 -0000      1.4
+++ patches/patch-aj    7 Dec 2007 19:05:04 -0000
---- glib/giounix.c.orig        2007-01-30 02:23:28.238812000 +1300
+--- glib/giounix.c.orig        2007-11-24 06:40:59.000000000 +0000
 +++ glib/giounix.c
-@@ -33,6 +33,7 @@
+@@ -33,7 +33,9 @@
  
  #include "config.h"
  
 +#define _XOPEN_SOURCE 600
  #define _POSIX_SOURCE         /* for SSIZE_MAX */
++#define _STDC_C99
  
  #include <sys/types.h>
+ #include <sys/stat.h>

>Unformatted: