X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=src%2Fhash.c;h=7740b32876522e7a411ee4f21dff5e51d0eeadff;hp=b5acfc2238aeb699349fb06d27b1762ca48b7509;hb=462e643a7e31676eceda23e634241f7b4d2cd7bb;hpb=3073a77ed89e7d9527d110a028d134bfd1f9cb40 diff --git a/src/hash.c b/src/hash.c index b5acfc22..7740b328 100644 --- a/src/hash.c +++ b/src/hash.c @@ -31,8 +31,8 @@ as that of the covered work. */ /* With -DSTANDALONE, this file can be compiled outside Wget source tree. To test, also use -DTEST. */ -#ifdef HAVE_CONFIG_H -# include +#ifndef STANDALONE +# include "wget.h" #endif #include @@ -43,7 +43,6 @@ as that of the covered work. */ #ifndef STANDALONE /* Get Wget's utility headers. */ -# include "wget.h" # include "utils.h" #else /* Make do without them. */ @@ -55,7 +54,7 @@ as that of the covered work. */ # define countof(x) (sizeof (x) / sizeof ((x)[0])) # endif # include -# define TOLOWER(x) tolower ((unsigned char) (x)) +# define c_tolower(x) tolower ((unsigned char) (x)) # if __STDC_VERSION__ >= 199901L # include /* for uintptr_t */ # else @@ -681,11 +680,11 @@ static unsigned long hash_string_nocase (const void *key) { const char *p = key; - unsigned int h = TOLOWER (*p); + unsigned int h = c_tolower (*p); if (h) for (p += 1; *p != '\0'; p++) - h = (h << 5) - h + TOLOWER (*p); + h = (h << 5) - h + c_tolower (*p); return h; }