From 32d64b2e875f0d74cd433dff8bda9f8a98dcd44e Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 22 Aug 2019 15:29:14 +0200 Subject: defines: avoid underscore-prefixed defines Double-underscored or underscore plus uppercase letter at least. ... as they're claimed to be reserved. Reported-by: patnyb on github Fixes #4254 Closes #4255 --- docs/examples/ephiperfifo.c | 16 ++++++++-------- docs/examples/hiperfifo.c | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) (limited to 'docs') diff --git a/docs/examples/ephiperfifo.c b/docs/examples/ephiperfifo.c index 657b61257..c076a8523 100644 --- a/docs/examples/ephiperfifo.c +++ b/docs/examples/ephiperfifo.c @@ -108,7 +108,7 @@ typedef struct _SockInfo GlobalInfo *global; } SockInfo; -#define __case(code) \ +#define mycase(code) \ case code: s = __STRING(code) /* Die if we get a bad CURLMcode somewhere */ @@ -117,14 +117,14 @@ static void mcode_or_die(const char *where, CURLMcode code) if(CURLM_OK != code) { const char *s; switch(code) { - __case(CURLM_BAD_HANDLE); break; - __case(CURLM_BAD_EASY_HANDLE); break; - __case(CURLM_OUT_OF_MEMORY); break; - __case(CURLM_INTERNAL_ERROR); break; - __case(CURLM_UNKNOWN_OPTION); break; - __case(CURLM_LAST); break; + mycase(CURLM_BAD_HANDLE); break; + mycase(CURLM_BAD_EASY_HANDLE); break; + mycase(CURLM_OUT_OF_MEMORY); break; + mycase(CURLM_INTERNAL_ERROR); break; + mycase(CURLM_UNKNOWN_OPTION); break; + mycase(CURLM_LAST); break; default: s = "CURLM_unknown"; break; - __case(CURLM_BAD_SOCKET); + mycase(CURLM_BAD_SOCKET); fprintf(MSG_OUT, "ERROR: %s returns %s\n", where, s); /* ignore this error */ return; diff --git a/docs/examples/hiperfifo.c b/docs/examples/hiperfifo.c index 6f176365b..c02659b9a 100644 --- a/docs/examples/hiperfifo.c +++ b/docs/examples/hiperfifo.c @@ -109,7 +109,7 @@ typedef struct _SockInfo GlobalInfo *global; } SockInfo; -#define __case(code) \ +#define mycase(code) \ case code: s = __STRING(code) /* Die if we get a bad CURLMcode somewhere */ @@ -118,14 +118,14 @@ static void mcode_or_die(const char *where, CURLMcode code) if(CURLM_OK != code) { const char *s; switch(code) { - __case(CURLM_BAD_HANDLE); break; - __case(CURLM_BAD_EASY_HANDLE); break; - __case(CURLM_OUT_OF_MEMORY); break; - __case(CURLM_INTERNAL_ERROR); break; - __case(CURLM_UNKNOWN_OPTION); break; - __case(CURLM_LAST); break; + mycase(CURLM_BAD_HANDLE); break; + mycase(CURLM_BAD_EASY_HANDLE); break; + mycase(CURLM_OUT_OF_MEMORY); break; + mycase(CURLM_INTERNAL_ERROR); break; + mycase(CURLM_UNKNOWN_OPTION); break; + mycase(CURLM_LAST); break; default: s = "CURLM_unknown"; break; - __case(CURLM_BAD_SOCKET); + mycase(CURLM_BAD_SOCKET); fprintf(MSG_OUT, "ERROR: %s returns %s\n", where, s); /* ignore this error */ return; -- cgit v1.2.1