diff options
| author | Miles Bader <miles@gnu.org> | 1997-07-03 17:37:59 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 1997-07-03 17:37:59 +0000 |
| commit | f24955c73616e6ee49662705116f26ea8a6747ea (patch) | |
| tree | 8465065115ed9a65ea4d4342e7933e551a369840 | |
| parent | cb6c552cb36cf41b932b347fe50640e156e105a1 (diff) | |
Remove extra #endif.
Pretty print.
Standardize the multiple-include protect (for libc).
| -rw-r--r-- | libshouldbeinlibc/argp.h | 43 |
1 files changed, 21 insertions, 22 deletions
diff --git a/libshouldbeinlibc/argp.h b/libshouldbeinlibc/argp.h index 2305590a..55024cac 100644 --- a/libshouldbeinlibc/argp.h +++ b/libshouldbeinlibc/argp.h @@ -18,8 +18,8 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef __ARGP_H__ -#define __ARGP_H__ +#ifndef _ARGP_H +#define _ARGP_H #include <stdio.h> #include <ctype.h> @@ -29,16 +29,16 @@ #include <errno.h> #ifndef __const -#define __const const +# define __const const #endif #ifndef __error_t_defined typedef int error_t; -#define __error_t_defined +# define __error_t_defined #endif #ifndef __P -# if (defined (__STDC__) && __STDC__) || defined (__cplusplus) +# if (defined __STDC__ && __STDC__) || defined __cplusplus # define __P(args) args # else # define __P(args) () @@ -510,16 +510,16 @@ extern void *__argp_input __P ((__const struct argp *argp, #ifdef __OPTIMIZE__ -#if !_LIBC -# define __argp_usage argp_usage -# define __argp_state_help argp_state_help -# define __option_is_short _option_is_short -# define __option_is_end _option_is_end -#endif +# if !_LIBC +# define __argp_usage argp_usage +# define __argp_state_help argp_state_help +# define __option_is_short _option_is_short +# define __option_is_end _option_is_end +# endif -#ifndef ARGP_EI -# define ARGP_EI extern inline -#endif +# ifndef ARGP_EI +# define ARGP_EI extern inline +# endif ARGP_EI void __argp_usage (__const struct argp_state *__state) @@ -545,17 +545,16 @@ __option_is_end (__const struct argp_option *__opt) return !__opt->key && !__opt->name && !__opt->doc && !__opt->group; } -#if !_LIBC -# undef __argp_usage -# undef __argp_state_help -# undef __option_is_short -# undef __option_is_end -#endif - +# if !_LIBC +# undef __argp_usage +# undef __argp_state_help +# undef __option_is_short +# undef __option_is_end +# endif #endif /* __OPTIMIZE__ */ #ifdef __cplusplus } #endif -#endif /* __ARGP_H__ */ +#endif /* argp.h */ |