aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ares/setup_once.h27
-rw-r--r--lib/setup.h10
-rw-r--r--lib/setup_once.h23
-rw-r--r--src/setup.h16
4 files changed, 54 insertions, 22 deletions
diff --git a/ares/setup_once.h b/ares/setup_once.h
index 0ca6863e2..15ad56395 100644
--- a/ares/setup_once.h
+++ b/ares/setup_once.h
@@ -17,6 +17,16 @@
*/
+/********************************************************************
+ * NOTICE *
+ * ======== *
+ * *
+ * Content of header files lib/setup_once.h and ares/setup_once.h *
+ * must be kept in sync. Modify the other one if you change this. *
+ * *
+ ********************************************************************/
+
+
/*
* If we have the MSG_NOSIGNAL define, make sure we use
* it as the fourth argument of send() and recv()
@@ -67,7 +77,7 @@
(RECV_TYPE_ARG4)(SEND_4TH_ARG))
#endif
#else /* HAVE_RECV */
-#ifdef DJGPP
+#ifdef MSDOS
#define sread(x,y,z) (ssize_t)read_s((int)(x), (char *)(y), (int)(z))
#endif
#ifndef sread
@@ -94,7 +104,7 @@
(SEND_TYPE_ARG4)(SEND_4TH_ARG))
#endif
#else /* HAVE_SEND */
-#ifdef DJGPP
+#ifdef MSDOS
#define swrite(x,y,z) (ssize_t)write_s((int)(x), (char *)(y), (int)(z))
#endif
#ifndef swrite
@@ -105,5 +115,18 @@
#endif /* HAVE_SEND */
+/*
+ * Uppercase macro versions of ANSI/ISO is*() functions/macros which
+ * avoid negative number inputs whith argument byte codes > 127.
+ */
+
+#define ISSPACE(x) (isspace((int) ((unsigned char)x)))
+#define ISDIGIT(x) (isdigit((int) ((unsigned char)x)))
+#define ISALNUM(x) (isalnum((int) ((unsigned char)x)))
+#define ISXDIGIT(x) (isxdigit((int) ((unsigned char)x)))
+#define ISGRAPH(x) (isgraph((int) ((unsigned char)x)))
+#define ISALPHA(x) (isalpha((int) ((unsigned char)x)))
+
+
#endif /* __SETUP_ONCE_H */
diff --git a/lib/setup.h b/lib/setup.h
index 4f1a3c1cd..a02834ecd 100644
--- a/lib/setup.h
+++ b/lib/setup.h
@@ -348,16 +348,6 @@ int fileno( FILE *stream);
#define DEBUGF(x)
#endif
-#ifndef ISSPACE
-/* typecasting craze to avoid negative number inputs to these macros */
-#define ISSPACE(x) (isspace((int)((unsigned char)x)))
-#define ISDIGIT(x) (isdigit((int)((unsigned char)x)))
-#define ISALNUM(x) (isalnum((int)((unsigned char)x)))
-#define ISXDIGIT(x) (isxdigit((int)((unsigned char)x)))
-#define ISGRAPH(x) (isgraph((int)((unsigned char)x)))
-#define ISALPHA(x) (isalpha((int)((unsigned char)x)))
-#endif
-
/*
* Include macros and defines that should only be processed once.
*/
diff --git a/lib/setup_once.h b/lib/setup_once.h
index d3a4cc0a1..9c00fd637 100644
--- a/lib/setup_once.h
+++ b/lib/setup_once.h
@@ -24,6 +24,16 @@
***************************************************************************/
+/********************************************************************
+ * NOTICE *
+ * ======== *
+ * *
+ * Content of header files lib/setup_once.h and ares/setup_once.h *
+ * must be kept in sync. Modify the other one if you change this. *
+ * *
+ ********************************************************************/
+
+
/*
* If we have the MSG_NOSIGNAL define, make sure we use
* it as the fourth argument of send() and recv()
@@ -112,5 +122,18 @@
#endif /* HAVE_SEND */
+/*
+ * Uppercase macro versions of ANSI/ISO is*() functions/macros which
+ * avoid negative number inputs whith argument byte codes > 127.
+ */
+
+#define ISSPACE(x) (isspace((int) ((unsigned char)x)))
+#define ISDIGIT(x) (isdigit((int) ((unsigned char)x)))
+#define ISALNUM(x) (isalnum((int) ((unsigned char)x)))
+#define ISXDIGIT(x) (isxdigit((int) ((unsigned char)x)))
+#define ISGRAPH(x) (isgraph((int) ((unsigned char)x)))
+#define ISALPHA(x) (isalpha((int) ((unsigned char)x)))
+
+
#endif /* __SETUP_ONCE_H */
diff --git a/src/setup.h b/src/setup.h
index a8f636974..6e0f23a15 100644
--- a/src/setup.h
+++ b/src/setup.h
@@ -184,16 +184,12 @@ int fileno( FILE *stream);
#define strdup(ptr) curlx_strdup(ptr)
#endif
-#ifndef ISSPACE
-/* typecasting craze to avoid negative number inputs to these macros */
-/* copied from lib/setup.h */
-#define ISSPACE(x) (isspace((int)((unsigned char)x)))
-#define ISDIGIT(x) (isdigit((int)((unsigned char)x)))
-#define ISALNUM(x) (isalnum((int)((unsigned char)x)))
-#define ISXDIGIT(x) (isxdigit((int)((unsigned char)x)))
-#define ISGRAPH(x) (isgraph((int)((unsigned char)x)))
-#define ISALPHA(x) (isalpha((int)((unsigned char)x)))
-#define ISPRINT(x) (isprint((int)((unsigned char)x)))
+/*
+ * Include macros and defines that should only be processed once.
+ */
+
+#ifndef __SETUP_ONCE_H
+#include "setup_once.h"
#endif
#endif /* __SRC_CURL_SETUP_H */