diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2018-01-29 00:58:59 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2018-01-29 22:56:43 +0100 |
| commit | 4272a0b0fc49a1ac0ceab5c4a365c9f6ab8bf8e2 (patch) | |
| tree | e8872ad6bbc20375a0a222ddad9cddca481522d4 /lib/curl_setup_once.h | |
| parent | 93836e2ba0359352d85a029179f7d9db4d093894 (diff) | |
| download | curl-4272a0b0fc49a1ac0ceab5c4a365c9f6ab8bf8e2.tar.gz | |
curl_ctype: private is*() type macros and functions
... since the libc provided one are locale dependent in a way we don't
want. Also, the "native" isalnum() (for example) works differently on
different platforms which caused test 1307 failures on macos only.
Closes #2269
Diffstat (limited to 'lib/curl_setup_once.h')
| -rw-r--r-- | lib/curl_setup_once.h | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/lib/curl_setup_once.h b/lib/curl_setup_once.h index a5b542c6e..6d01ea156 100644 --- a/lib/curl_setup_once.h +++ b/lib/curl_setup_once.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -101,7 +101,6 @@ # endif #endif - /* * Definition of timeval struct for platforms that don't have it. */ @@ -274,25 +273,6 @@ struct timeval { # define sfcntl fcntl #endif -/* - * Uppercase macro versions of ANSI/ISO is*() functions/macros which - * avoid negative number inputs with 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))) -#define ISPRINT(x) (isprint((int) ((unsigned char)x))) -#define ISUPPER(x) (isupper((int) ((unsigned char)x))) -#define ISLOWER(x) (islower((int) ((unsigned char)x))) -#define ISASCII(x) (isascii((int) ((unsigned char)x))) - -#define ISBLANK(x) (int)((((unsigned char)x) == ' ') || \ - (((unsigned char)x) == '\t')) - #define TOLOWER(x) (tolower((int) ((unsigned char)x))) @@ -347,6 +327,7 @@ struct timeval { #define FALSE false #endif +#include "curl_ctype.h" /* * Macro WHILE_FALSE may be used to build single-iteration do-while loops, |