diff options
-rw-r--r-- | lib/readtokens.c | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/lib/readtokens.c b/lib/readtokens.c index bb427729c..e826c8daa 100644 --- a/lib/readtokens.c +++ b/lib/readtokens.c @@ -31,24 +31,12 @@ # include <config.h> #endif -#include <stdio.h> - -#ifdef STDC_HEADERS -# include <stdlib.h> -#endif +#include "readtokens.h" -#if defined (STDC_HEADERS) || defined(HAVE_STRING_H) -# include <string.h> -/* An ANSI string.h and pre-ANSI memory.h might conflict. */ -# if !defined (STDC_HEADERS) && defined (HAVE_MEMORY_H) -# include <memory.h> -# endif /* not STDC_HEADERS and HAVE_MEMORY_H */ -#else /* not STDC_HEADERS and not HAVE_STRING_H */ -# include <strings.h> -/* memory.h and strings.h conflict on some systems. */ -#endif /* not STDC_HEADERS and not HAVE_STRING_H */ +#include <stdio.h> +#include <stdlib.h> +#include <string.h> -#include "readtokens.h" #include "unlocked-io.h" #include "xalloc.h" @@ -58,8 +46,7 @@ /* Initialize a tokenbuffer. */ void -init_tokenbuffer (tokenbuffer) - token_buffer *tokenbuffer; +init_tokenbuffer (token_buffer *tokenbuffer) { tokenbuffer->size = INITIAL_TOKEN_LENGTH; tokenbuffer->buffer = xmalloc (INITIAL_TOKEN_LENGTH); |