Imported from ../bash-2.04.tar.gz.

[platform/upstream/bash.git] / include / stdc.h

diff --git a/stdc.h b/include/stdc.h
similarity index 88%
rename from stdc.h
rename to include/stdc.h
index f1590c6..c216a69 100644 (file)
--- a/stdc.h
+++ b/include/stdc.h
@@ -7,7 +7,7 @@
 
    Bash is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 1, or (at your option)
+   the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
    Bash is distributed in the hope that it will be useful, but WITHOUT
@@ -17,7 +17,7 @@
 
    You should have received a copy of the GNU General Public License
    along with Bash; see the file COPYING.  If not, write to the Free
-   Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
+   Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
 
 #if !defined (_STDC_H_)
 #define _STDC_H_
@@ -28,11 +28,16 @@
    and traditional C compilers with something like this:
        extern char *func __P((char *, char *, int)); */
 
-#if defined (__STDC__)
-
-#  if !defined (__P)
+#if !defined (__P)
+#  if defined (__STDC__) || defined (__GNUC__) || defined (__cplusplus)
 #    define __P(protos) protos
+#  else 
+#    define __P(protos) ()
 #  endif
+#endif
+
+#if defined (__STDC__)
+
 #  define __STRING(x) #x
 
 #  if !defined (__GNUC__)
@@ -41,9 +46,6 @@
 
 #else /* !__STDC__ */
 
-#  if !defined (__P)
-#    define __P(protos) ()
-#  endif
 #  define __STRING(x) "x"
 
 #if defined (__GNUC__)         /* gcc with -traditional */