Windows: remove unused defines from param.h

Remove #if 0 disabled definitions and those for strtoll and
strtoull as they are not used anywhere in the tree.  strtoll
and strtoull will conflict with the next roken.h update.

Change-Id: Ieea394abf6046be9b5974464890b7af945c00153
Reviewed-on: http://gerrit.openafs.org/7621
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>

diff --git a/src/config/param.amd64_w2k.h b/src/config/param.amd64_w2k.h
index af0a702..c7427ad 100644 (file)
--- a/src/config/param.amd64_w2k.h
+++ b/src/config/param.amd64_w2k.h
@@ -52,19 +52,9 @@ typedef __int64 ssize_t;
 #endif
 #endif
 
-#if 0
-#define memset(A, 0, S) memset((void*)(A), 0, (size_t)(S))
-#define memcpy(B, A, S) memcpy((void*)(B), (void*)(A), (size_t)(S))
-/* There is a minor syntactic difference between memcmp and bcmp... */
-#define memcmp(A, B, S) (memcmp((void*)(A), (void*)(B), (size_t)(S)) ? 1 : 0)
-#define strchr(s, c)             strchr(s, c)
-#define strrchr(s, c)            strrchr(s, c)
-#endif
 #define strcasecmp(s1,s2)       _stricmp(s1,s2)
 #define strncasecmp(s1,s2,n)    _strnicmp(s1,s2,n)
 #define sleep(seconds)          Sleep((seconds) * 1000)
-#define strtoll(str, cp, base)  strtoi64((str), (cp), (base))
-#define strtoull(str, cp, base) strtoui64((str), (cp), (base))
 
 #define random()                rand()
 #define srandom(a)              srand(a)

diff --git a/src/config/param.i386_nt40.h b/src/config/param.i386_nt40.h
index ec87e56..c54d6de 100644 (file)
--- a/src/config/param.i386_nt40.h
+++ b/src/config/param.i386_nt40.h
@@ -43,19 +43,9 @@ typedef int ssize_t;
  * can be written */
 #define lstat(a, b)       _stat((a), (struct _stat *)(b))
 
-#if 0
-#define memset(A, 0, S) memset((void*)(A), 0, (size_t)(S))
-#define memcpy(B, A, S) memcpy((void*)(B), (void*)(A), (size_t)(S))
-/* There is a minor syntactic difference between memcmp and bcmp... */
-#define memcmp(A, B, S) (memcmp((void*)(A), (void*)(B), (size_t)(S)) ? 1 : 0)
-#define strchr(s, c)             strchr(s, c)
-#define strrchr(s, c)            strrchr(s, c)
-#endif
 #define strcasecmp(s1,s2)       _stricmp(s1,s2)
 #define strncasecmp(s1,s2,n)    _strnicmp(s1,s2,n)
 #define sleep(seconds)          Sleep((seconds) * 1000)
-#define strtoll(str, cp, base)  strtoi64((str), (cp), (base))
-#define strtoull(str, cp, base) strtoui64((str), (cp), (base))
 
 #define random()                rand()
 #define srandom(a)              srand(a)

diff --git a/src/config/param.i386_w2k.h b/src/config/param.i386_w2k.h
index e199332..b98c22a 100644 (file)
--- a/src/config/param.i386_w2k.h
+++ b/src/config/param.i386_w2k.h
@@ -51,19 +51,9 @@ typedef int ssize_t;
 #endif
 #endif
 
-#if 0
-#define memset(A, 0, S) memset((void*)(A), 0, (size_t)(S))
-#define memcpy(B, A, S) memcpy((void*)(B), (void*)(A), (size_t)(S))
-/* There is a minor syntactic difference between memcmp and bcmp... */
-#define memcmp(A, B, S) (memcmp((void*)(A), (void*)(B), (size_t)(S)) ? 1 : 0)
-#define strchr(s, c)             strchr(s, c)
-#define strrchr(s, c)            strrchr(s, c)
-#endif
 #define strcasecmp(s1,s2)       _stricmp(s1,s2)
 #define strncasecmp(s1,s2,n)    _strnicmp(s1,s2,n)
 #define sleep(seconds)          Sleep((seconds) * 1000)
-#define strtoll(str, cp, base)  strtoi64((str), (cp), (base))
-#define strtoull(str, cp, base) strtoui64((str), (cp), (base))
 
 #define random()                rand()
 #define srandom(a)              srand(a)

diff --git a/src/config/param.i64_w2k.h b/src/config/param.i64_w2k.h
index 8ef7e9c..f6dc1c9 100644 (file)
--- a/src/config/param.i64_w2k.h
+++ b/src/config/param.i64_w2k.h
@@ -50,21 +50,11 @@ typedef __int64 ssize_t;
 #endif
 #endif
 
-#if 0
-#define memset(A, 0, S) memset((void*)(A), 0, (size_t)(S))
-#define memcpy(B, A, S) memcpy((void*)(B), (void*)(A), (size_t)(S))
-/* There is a minor syntactic difference between memcmp and bcmp... */
-#define memcmp(A, B, S) (memcmp((void*)(A), (void*)(B), (size_t)(S)) ? 1 : 0)
-#define strchr(s, c)             strchr(s, c)
-#define strrchr(s, c)            strrchr(s, c)
-#endif
 #define strcasecmp(s1,s2)       _stricmp(s1,s2)
 #define strncasecmp(s1,s2,n)    _strnicmp(s1,s2,n)
 #define sleep(seconds)          Sleep((seconds) * 1000)
 #define fsync(fileno)           _commit(fileno)
 #define ftruncate(fd, size)     _chsize((fd), (long)(size))
-#define strtoll(str, cp, base)  strtoi64((str), (cp), (base))
-#define strtoull(str, cp, base) strtoui64((str), (cp), (base))
 
 #define random()                rand()
 #define srandom(a)              srand(a)