[patch] Fix GCC-specific #defines in gzip

gzip-1.3.13-irix.patch (text/plain), 2.59 KB, created by Stuart Shelton on 2009-10-22 13:23:42 UTC

--- lib/stdio.in.h.dist	2009-10-22 13:06:09.782771640 +0100
+++ lib/stdio.in.h	2009-10-22 13:52:03.698959960 +0100
@@ -49,14 +49,14 @@
 # include <sys/types.h>
 #endif
 
-#ifndef __attribute__
+#if !defined(__attribute__) || defined(__sgi)
 /* This feature is available in gcc versions 2.5 and later.  */
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || !defined(__GNUC__) || defined(__sgi)
 #  define __attribute__(Spec) /* empty */
 # endif
 /* The __-protected variants of `format' and `printf' attributes
    are accepted by gcc versions 2.6.4 (effectively 2.7) and later.  */
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7) || !defined(__GNUC__) || defined(__sgi)
 #  define __format__ format
 #  define __printf__ printf
 # endif
--- lib/error.h.dist	2009-10-22 13:05:52.430045880 +0100
+++ lib/error.h	2009-10-22 13:51:41.747682120 +0100
@@ -18,14 +18,14 @@
 #ifndef _ERROR_H
 #define _ERROR_H 1
 
-#ifndef __attribute__
+#if !defined(__attribute__) || defined(__sgi)
 /* This feature is available in gcc versions 2.5 and later.  */
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || !defined(__GNUC__) || defined(__sgi)
 #  define __attribute__(Spec) /* empty */
 # endif
 /* The __-protected variants of `format' and `printf' attributes
    are accepted by gcc versions 2.6.4 (effectively 2.7) and later.  */
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7) || !defined(__GNUC__) || defined(__sgi)
 #  define __format__ format
 #  define __printf__ printf
 # endif
--- lib/vasnprintf.h.dist	2009-10-22 13:06:01.127555240 +0100
+++ lib/vasnprintf.h	2009-10-22 13:51:34.780526280 +0100
@@ -26,14 +26,14 @@
 /* Get size_t.  */
 #include <stddef.h>
 
-#ifndef __attribute__
+#if !defined(__attribute__) || defined(__sgi)
 /* This feature is available in gcc versions 2.5 and later.  */
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || !defined(__GNUC__) || defined(__sgi)
 #  define __attribute__(Spec) /* empty */
 # endif
 /* The __-protected variants of `format' and `printf' attributes
    are accepted by gcc versions 2.6.4 (effectively 2.7) and later.  */
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7) || !defined(__GNUC__) || defined(__sgi)
 #  define __format__ format
 #  define __printf__ printf
 # endif