daily update

[deliverable/binutils-gdb.git] / readline / rlstdc.h

diff --git a/readline/rlstdc.h b/readline/rlstdc.h
index 08b0f89aa2e7ef80e5a466715f1187497a913cdd..847fa9c26f4cec0b857391d702035885ae6b0dcb 100644 (file)
--- a/readline/rlstdc.h
+++ b/readline/rlstdc.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
 
    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
    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
 
    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 (_RL_STDC_H_)
 #define _RL_STDC_H_
 
 #if !defined (_RL_STDC_H_)
 #define _RL_STDC_H_


@@ -26,54 +26,20 @@
 
 /* A function can be defined using prototypes and compile on both ANSI C
    and traditional C compilers with something like this:
 
 /* A function can be defined using prototypes and compile on both ANSI C
    and traditional C compilers with something like this:

-       extern char *func __P((char *, char *, int)); */
+       extern char *func PARAMS((char *, char *, int)); */

 
 

-#if defined (__STDC__)
-
-#  if !defined (__P)
-#    define __P(protos) protos
-#  endif
-#  define __STRING(x) #x
-
-#  if !defined (__GNUC__)
-#    define inline
+#if !defined (PARAMS)
+#  if defined (__STDC__) || defined (__GNUC__) || defined (__cplusplus)
+#    define PARAMS(protos) protos
+#  else
+#    define PARAMS(protos) ()

 #  endif
 #  endif

+#endif

 
 

-#else /* !__STDC__ */
-
-#  if !defined (__P)
-#    define __P(protos) ()
-#  endif
-#  define __STRING(x) "x"
-
-#if defined (__GNUC__)         /* gcc with -traditional */
-#  if !defined (const)
-#    define const  __const
-#  endif
-#  if !defined (inline)
-#    define inline __inline
+#ifndef __attribute__
+#  if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8)
+#    define __attribute__(x)

 #  endif
 #  endif

-#  if !defined (signed)
-#    define signed __signed
-#  endif
-#  if !defined (volatile)
-#    define volatile __volatile
-#  endif
-#else /* !__GNUC__ */
-#  if !defined (const)
-#    define const
-#  endif
-#  if !defined (inline)
-#    define inline
-#  endif
-#  if !defined (signed)
-#    define signed
-#  endif
-#  if !defined (volatile)
-#    define volatile
-#  endif
-#endif /* !__GNUC__ */
-
-#endif /* !__STDC__ */
+#endif

 
 #endif /* !_RL_STDC_H_ */
 
 #endif /* !_RL_STDC_H_ */