From 6b7e3e1cfdeabb44c34fc36fe4ba324b614cde6a Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.de>
Date: Mon, 25 Apr 2005 10:48:59 +0000
Subject: [PATCH] gcc4 alias fixes.

---
 include/msvcrt/conio.h   | 2 +-
 include/msvcrt/io.h      | 2 +-
 include/msvcrt/process.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/msvcrt/conio.h b/include/msvcrt/conio.h
index f3e72e6f869..0c958dff1b0 100644
--- a/include/msvcrt/conio.h
+++ b/include/msvcrt/conio.h
@@ -53,7 +53,7 @@ static inline int outp(unsigned short i, int j) { return _outp(i, j); }
 static inline unsigned short outpw(unsigned short i, unsigned short j) { return _outpw(i, j); }
 #endif
 
-#ifdef __GNUC__
+#if defined(__GNUC__) && (__GNUC__ < 4)
 extern int cprintf(const char*,...) __attribute__((alias("_cprintf"),format(printf,1,2)));
 extern int cscanf(const char*,...) __attribute__((alias("_cscanf"),format(scanf,1,2)));
 #else
diff --git a/include/msvcrt/io.h b/include/msvcrt/io.h
index c3581dd59b4..c3cd315376c 100644
--- a/include/msvcrt/io.h
+++ b/include/msvcrt/io.h
@@ -175,7 +175,7 @@ static inline int unlink(const char* path) { return _unlink(path); }
 #endif
 static inline int write(int fd, const void* buf, unsigned int size) { return _write(fd, buf, size); }
 
-#ifdef __GNUC__
+#if defined(__GNUC__) && (__GNUC__ < 4)
 extern int open(const char*,int,...) __attribute__((alias("_open")));
 extern int sopen(const char*,int,int,...) __attribute__((alias("_sopen")));
 #else
diff --git a/include/msvcrt/process.h b/include/msvcrt/process.h
index 1c7aff5771c..7e52d5f5bce 100644
--- a/include/msvcrt/process.h
+++ b/include/msvcrt/process.h
@@ -125,7 +125,7 @@ static inline int spawnve(int flags, const char* name, const char* const* argv,
 static inline int spawnvp(int flags, const char* name, const char* const* argv) { return _spawnvp(flags, name, argv); }
 static inline int spawnvpe(int flags, const char* name, const char* const* argv, const char* const* envv) { return _spawnvpe(flags, name, argv, envv); }
 
-#ifdef __GNUC__
+#if defined(__GNUC__) && (__GNUC__ < 4)
 extern int execl(const char*,const char*,...) __attribute__((alias("_execl")));
 extern int execle(const char*,const char*,...) __attribute__((alias("_execle")));
 extern int execlp(const char*,const char*,...) __attribute__((alias("_execlp")));