diff options
| author | Jari Aalto <jari.aalto@cante.net> | 2000-03-17 21:46:59 +0000 |
|---|---|---|
| committer | Jari Aalto <jari.aalto@cante.net> | 2009-09-12 16:46:53 +0000 |
| commit | bb70624e964126b7ac4ff085ba163a9c35ffa18f (patch) | |
| tree | ba2dd4add13ada94b1899c6d4aca80195b80b74b /lib/readline/rlstdc.h | |
| parent | b72432fdcc59300c6fe7c9d6c8a31ad3447933f5 (diff) | |
| download | android_external_bash-bb70624e964126b7ac4ff085ba163a9c35ffa18f.tar.gz android_external_bash-bb70624e964126b7ac4ff085ba163a9c35ffa18f.tar.bz2 android_external_bash-bb70624e964126b7ac4ff085ba163a9c35ffa18f.zip | |
Imported from ../bash-2.04.tar.gz.
Diffstat (limited to 'lib/readline/rlstdc.h')
| -rw-r--r-- | lib/readline/rlstdc.h | 58 |
1 files changed, 9 insertions, 49 deletions
diff --git a/lib/readline/rlstdc.h b/lib/readline/rlstdc.h index f1590c6..dac8e98 100644 --- a/lib/readline/rlstdc.h +++ b/lib/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 - 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,10 +17,10 @@ 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_ +#if !defined (_RL_STDC_H_) +#define _RL_STDC_H_ /* Adapted from BSD /usr/include/sys/cdefs.h. */ @@ -28,52 +28,12 @@ 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 -# endif -# define __STRING(x) #x - -# if !defined (__GNUC__) -# define inline -# endif - -#else /* !__STDC__ */ - -# if !defined (__P) +# else # 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 -# 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 /* !_STDC_H_ */ +#endif /* !_RL_STDC_H_ */ |