Change from using #ifdef to #if for features tests

"#if FOO" still works with simple -DFOO, but gives more flexibility.
Specifically, if user expressed no preference (FOO is not defined),
we can apply reasonable defaults (this is the legitimate use of ifdef).

In short, from now on, please use

 #if MG_ENABLE_FOO

instead of

 #ifdef MG_ENABLE_FOO

Since we are all used to #ifdef, this change also adds a precommit check
to police this. Specifically, in *.h and *.c files that are Copyright Cesanta,
"ifdef" and "if defined()" are not allowed to be used with macros that contain
ENABLE or DISABLE, unless the like also contains "ifdef-ok".

Hence, if you are sure you want to use ifdef, use this:

 #ifdef MG_ENABLE_FOO /* ifdef-ok */

PUBLISHED_FROM=9be829448f53cff575d6cae8b9945fb12531c15a
This commit is contained in:
Deomid Ryabkov authored and Cesanta Bot committed 2016-10-13 18:07:25 +00:00
1 parent 0a8f839281
commit bafc30bec6
13 files changed
+380 -208

No files matched your search

+2 -2
View File
@@ -6,7 +6,7 @@
#ifndef CS_COMMON_CS_DBG_H_
#define CS_COMMON_CS_DBG_H_
#ifndef CS_DISABLE_STDIO
#if !CS_DISABLE_STDIO
#include <stdio.h>
#endif
@@ -28,7 +28,7 @@ enum cs_log_level {
void cs_log_set_level(enum cs_log_level level);
#ifndef CS_DISABLE_STDIO
#if !CS_DISABLE_STDIO
void cs_log_set_file(FILE *file);
+1 -1
View File
@@ -27,7 +27,7 @@ endif # } PDIR
LDDIR = $(SDK_PATH)/ld
CCFLAGS += -Os
CCFLAGS += -Os -Wno-undef
TARGET_LDFLAGS = \
-nostdlib \
+2 -2
View File
@@ -24,8 +24,8 @@ endif
# for a subtree within the makefile rooted therein
#
DEFINES += -DCS_PLATFORM=3 \
-DMG_NO_BSD_SOCKETS \
-DMG_DISABLE_FILESYSTEM \
-DMG_NO_BSD_SOCKETS=1 \
-DMG_DISABLE_FILESYSTEM=1 \
-DRTOS_SDK -DMG_LWIP -DLWIP_TIMEVAL_PRIVATE=0 \
-DMG_INTERNAL=
+2 -2
View File
@@ -6,7 +6,7 @@
#ifndef CS_COMMON_CS_DBG_H_
#define CS_COMMON_CS_DBG_H_
#ifndef CS_DISABLE_STDIO
#if !CS_DISABLE_STDIO
#include <stdio.h>
#endif
@@ -28,7 +28,7 @@ enum cs_log_level {
void cs_log_set_level(enum cs_log_level level);
#ifndef CS_DISABLE_STDIO
#if !CS_DISABLE_STDIO
void cs_log_set_file(FILE *file);
+3 -3
View File
@@ -60,7 +60,7 @@ static int s_num_vhost_backends = 0, s_num_default_backends = 0;
static int s_sig_num = 0;
static int s_backend_keepalive = 0;
static FILE *s_log_file = NULL;
#ifdef MG_ENABLE_SSL
#if MG_ENABLE_SSL
const char *s_ssl_cert = NULL;
#endif
@@ -206,7 +206,7 @@ static void forward(struct conn_data *conn, struct http_message *hm,
for (i = 0; i < MG_MAX_HTTP_HEADERS && hm->header_names[i].len > 0; i++) {
struct mg_str hn = hm->header_names[i];
struct mg_str hv = hm->header_values[i];
#ifdef MG_ENABLE_SSL
#if MG_ENABLE_SSL
/*
* If we terminate SSL and backend redirects to local HTTP port,
* strip protocol to let client use HTTPS.
@@ -598,7 +598,7 @@ int main(int argc, char *argv[]) {
vhost = NULL;
redirect = 0;
i += 2;
#ifdef MG_ENABLE_SSL
#if MG_ENABLE_SSL
} else if (strcmp(argv[i], "-s") == 0 && i + 1 < argc) {
s_ssl_cert = argv[++i];
#endif
+5 -5
View File
@@ -53,7 +53,7 @@ int main(int argc, char *argv[]) {
int i;
char *cp;
const char *err_str;
#ifdef MG_ENABLE_SSL
#if MG_ENABLE_SSL
const char *ssl_cert = NULL;
#endif
@@ -75,7 +75,7 @@ int main(int argc, char *argv[]) {
s_http_port = argv[++i];
} else if (strcmp(argv[i], "-a") == 0 && i + 1 < argc) {
s_http_server_opts.auth_domain = argv[++i];
#ifdef MG_ENABLE_JAVASCRIPT
#if MG_ENABLE_JAVASCRIPT
} else if (strcmp(argv[i], "-j") == 0 && i + 1 < argc) {
const char *init_file = argv[++i];
mg_enable_javascript(&mgr, v7_create(), init_file);
@@ -86,11 +86,11 @@ int main(int argc, char *argv[]) {
s_http_server_opts.per_directory_auth_file = argv[++i];
} else if (strcmp(argv[i], "-r") == 0 && i + 1 < argc) {
s_http_server_opts.url_rewrites = argv[++i];
#ifndef MG_DISABLE_CGI
#if !MG_DISABLE_CGI
} else if (strcmp(argv[i], "-i") == 0 && i + 1 < argc) {
s_http_server_opts.cgi_interpreter = argv[++i];
#endif
#ifdef MG_ENABLE_SSL
#if MG_ENABLE_SSL
} else if (strcmp(argv[i], "-s") == 0 && i + 1 < argc) {
ssl_cert = argv[++i];
#endif
@@ -103,7 +103,7 @@ int main(int argc, char *argv[]) {
/* Set HTTP server options */
memset(&bind_opts, 0, sizeof(bind_opts));
bind_opts.error_string = &err_str;
#ifdef MG_ENABLE_SSL
#if MG_ENABLE_SSL
if (ssl_cert != NULL) {
bind_opts.ssl_cert = ssl_cert;
}
@@ -3,7 +3,7 @@
* All rights reserved
*/
#ifdef MG_ENABLE_SSL
#if MG_ENABLE_SSL
/*
* This example starts an SSL web server on https://localhost:8443/
*