1
0
mirror of https://git.savannah.gnu.org/git/gperf.git synced 2025-12-02 13:09:22 +00:00

Assume the available C compiler supports ANSI C. Remove K&R C cruft.

This commit is contained in:
Bruno Haible
2016-11-27 18:18:00 +01:00
parent a705809f3d
commit cabd2af10e
13 changed files with 51 additions and 237 deletions

View File

@@ -54,12 +54,7 @@ with
%%
#include <stdlib.h>
#include <string.h>
#if defined(__STDC__) || defined(__cplusplus)
#define CONST const
#else
#define CONST
#endif
static CONST char* testdata[] = {
static const char* testdata[] = {
"bogus",
"abstract",
"boolean",
@@ -121,9 +116,9 @@ int main ()
for (i = 0; i < sizeof(testdata)/sizeof(testdata[0]); i++)
{
#ifdef CPLUSPLUS_TEST
CONST char * resword = Perfect_Hash::in_word_set(testdata[i],strlen(testdata[i]));
const char * resword = Perfect_Hash::in_word_set(testdata[i],strlen(testdata[i]));
#else
CONST char * resword = in_word_set(testdata[i],strlen(testdata[i]));
const char * resword = in_word_set(testdata[i],strlen(testdata[i]));
#endif
if (i > 0)
{

View File

@@ -59,12 +59,7 @@ with, 53
%%
#include <stdlib.h>
#include <string.h>
#if defined(__STDC__) || defined(__cplusplus)
#define CONST const
#else
#define CONST
#endif
static CONST char* testdata[] = {
static const char* testdata[] = {
"bogus",
"abstract",
"boolean",
@@ -126,9 +121,9 @@ int main ()
for (i = 0; i < sizeof(testdata)/sizeof(testdata[0]); i++)
{
#ifdef CPLUSPLUS_TEST
CONST struct js_keyword * resword = Perfect_Hash::in_word_set(testdata[i],strlen(testdata[i]));
const struct js_keyword * resword = Perfect_Hash::in_word_set(testdata[i],strlen(testdata[i]));
#else
CONST struct js_keyword * resword = in_word_set(testdata[i],strlen(testdata[i]));
const struct js_keyword * resword = in_word_set(testdata[i],strlen(testdata[i]));
#endif
if (i > 0)
{

View File

@@ -59,12 +59,7 @@ with, 53
%%
#include <stdlib.h>
#include <string.h>
#if defined(__STDC__) || defined(__cplusplus)
#define CONST const
#else
#define CONST
#endif
static CONST char* testdata[] = {
static const char* testdata[] = {
"bogus",
"abstract",
"boolean",
@@ -126,9 +121,9 @@ int main ()
for (i = 0; i < sizeof(testdata)/sizeof(testdata[0]); i++)
{
#ifdef CPLUSPLUS_TEST
CONST struct js_keyword * resword = Perfect_Hash::in_word_set(testdata[i],strlen(testdata[i]));
const struct js_keyword * resword = Perfect_Hash::in_word_set(testdata[i],strlen(testdata[i]));
#else
CONST struct js_keyword * resword = in_word_set(testdata[i],strlen(testdata[i]));
const struct js_keyword * resword = in_word_set(testdata[i],strlen(testdata[i]));
#endif
if (i > 0)
{

View File

@@ -59,12 +59,7 @@ with, 53
%%
#include <stdlib.h>
#include <string.h>
#if defined(__STDC__) || defined(__cplusplus)
#define CONST const
#else
#define CONST
#endif
static CONST char* testdata[] = {
static const char* testdata[] = {
"bogus",
"abstract",
"boolean",
@@ -126,9 +121,9 @@ int main ()
for (i = 0; i < sizeof(testdata)/sizeof(testdata[0]); i++)
{
#ifdef CPLUSPLUS_TEST
CONST struct js_keyword * resword = Perfect_Hash::in_word_set(testdata[i],strlen(testdata[i]));
const struct js_keyword * resword = Perfect_Hash::in_word_set(testdata[i],strlen(testdata[i]));
#else
CONST struct js_keyword * resword = in_word_set(testdata[i],strlen(testdata[i]));
const struct js_keyword * resword = in_word_set(testdata[i],strlen(testdata[i]));
#endif
if (i > 0)
{

View File

@@ -7,18 +7,12 @@
#include <stdio.h>
#include <string.h>
#if defined __STDC__ || defined __cplusplus
extern char * in_word_set (const char *, int);
#else
extern char * in_word_set ();
#endif
extern const char * in_word_set (const char *, size_t);
#define MAX_LEN 80
int
main (argc, argv)
int argc;
char *argv[];
main (int argc, char *argv[])
{
int verbose = argc > 1 ? 1 : 0;
char buf[MAX_LEN];

View File

@@ -21,18 +21,12 @@
# define SET_BINARY(f) (void)0
#endif
#if defined __STDC__ || defined __cplusplus
extern struct language * in_word_set (const char *, int);
#else
extern struct language * in_word_set ();
#endif
extern struct language * in_word_set (const char *, size_t);
#define MAX_LEN 80
int
main (argc, argv)
int argc;
char *argv[];
main (int argc, char *argv[])
{
int verbose = argc > 1 ? 1 : 0;
char buf[2*MAX_LEN];