diff options
| author | Walter Harms <wharms@bfs.de> | 2019-01-11 22:54:47 +0100 |
|---|---|---|
| committer | Walter Harms <wharms@bfs.de> | 2019-01-11 22:54:47 +0100 |
| commit | 57c8b133bbcf38a9a1e345eabeeabe2a3e07c1c8 (patch) | |
| tree | dc864dce6ab6cb4b287892bb6bcbaea31a01be9b /util | |
| parent | d51325e11253f99bdcf672062cc04de80bc9c7e2 (diff) | |
| download | xorg-lib-libXt-57c8b133bbcf38a9a1e345eabeeabe2a3e07c1c8.tar.gz | |
resolv:shadows a global declaration
Diffstat (limited to 'util')
| -rw-r--r-- | util/makestrs.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/util/makestrs.c b/util/makestrs.c index 5764849..488c9bb 100644 --- a/util/makestrs.c +++ b/util/makestrs.c @@ -88,7 +88,7 @@ static int solaris_abi_names = FALSE; * commandline. Needed to separate source and build directories. */ static char* includedir = NULL; -static FILE *ifopen(const char *file, const char *mode) +static FILE *ifopen(const char *myfile, const char *mode) { #ifndef HAVE_ASPRINTF size_t len; @@ -97,13 +97,13 @@ static FILE *ifopen(const char *file, const char *mode) FILE *ret; if (includedir == NULL) - return fopen(file, mode); + return fopen(myfile, mode); #ifdef HAVE_ASPRINTF - if (asprintf(&buffer, "%s/%s", includedir, file) == -1) + if (asprintf(&buffer, "%s/%s", includedir, myfile) == -1) return NULL; #else - len = strlen(file) + strlen(includedir) + 1; + len = strlen(myfile) + strlen(includedir) + 1; buffer = (char*)malloc(len + 1); if (buffer == NULL) return NULL; @@ -622,7 +622,7 @@ static void DoLine(char *buf) } } -static void IntelABIIndexEntries (File *file) +static void IntelABIIndexEntries (File *myfile) { Table* t; TableEnt* te; @@ -635,7 +635,7 @@ static void IntelABIIndexEntries (File *file) } } -static void DefaultIndexEntries (File *file) +static void DefaultIndexEntries (File *myfile) { Table* t; TableEnt* te; @@ -649,7 +649,7 @@ static void DefaultIndexEntries (File *file) } } -static void IndexEntries (File *file, int abi) +static void IndexEntries (File *myfile, int abi) { switch (abi) { case X_SPARC_ABI: |