[haiku-development] Re: Hybrid GCC2/GCC4 build under R5

> Hi all
...
> I have attached a diff that 

In fact I have not because I accidently hit that send button a bit too 
early. Therefore the diff is attached here.

Do we want these changes commited or do we not really care about R5 
GCC4? Before applying the patches it should be tested on a linux GCC2 
build in any case, to see if it has any influence on that.

Opinions?

Regards
Michael

Index: src/tools/zip/unix/zipup.h
===================================================================
--- src/tools/zip/unix/zipup.h  (revision 25724)
+++ src/tools/zip/unix/zipup.h  (working copy)
@@ -6,6 +6,9 @@
   If, for some reason, both of these files are missing, the Info-ZIP license
   also may be found at:  ftp://ftp.cdrom.com/pub/infozip/license.html
 */
+#ifndef _ZIPUP_H_
+#define _ZIPUP_H_
+
 #ifndef O_RDONLY
 #  include <fcntl.h>
 #endif
@@ -17,3 +20,5 @@
 #define zclose(f) close(f)
 #define zerr(f) (k == (extent)(-1L))
 #define zstdin 0
+
+#endif // _ZIPUP_H_
Index: src/bin/zip/beos/zipup.h
===================================================================
--- src/bin/zip/beos/zipup.h    (revision 25724)
+++ src/bin/zip/beos/zipup.h    (working copy)
@@ -6,6 +6,9 @@
   If, for some reason, both of these files are missing, the Info-ZIP license
   also may be found at:  ftp://ftp.cdrom.com/pub/infozip/license.html
 */
+#ifndef _ZIPUP_H_
+#define _ZIPUP_H_
+
 #ifndef O_RDONLY
 #  include <fcntl.h>
 #endif
@@ -17,3 +20,5 @@
 #define zclose(f) close(f)
 #define zerr(f) (k == (extent)(-1L))
 #define zstdin 0
+
+#endif // _ZIPUP_H_
Index: src/tools/gensyscalls/gensyscalls.h
===================================================================
--- src/tools/gensyscalls/gensyscalls.h (revision 25724)
+++ src/tools/gensyscalls/gensyscalls.h (working copy)
@@ -1,6 +1,10 @@
 #ifndef GENSYSCALLS_H
 #define GENSYSCALLS_H
 
+#if __GNUC__ == 2
+typedef void *__builtin_va_list;
+#endif
+
 // Type
 class Type {
 public:

Other related posts: