summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorExplorer09 <explorer09@gmail.com>2017-11-05 00:10:03 +0800
committerWill Estes <westes575@gmail.com>2017-11-28 14:09:04 -0500
commitea1faa2d09693cf7f3a3c3c79a5ddb7fbd0d3ba5 (patch)
treefd7412aebcc1eda7f84725021c95cafa32f9a469
parent11b7512664c30cadd923f479c59bc3368a7b210d (diff)
build: fix ENABLE_NLS preprocessor check.
Because ENABLE_NLS may be defined to 0 (manually, not through autoconf) and it's semantically incorrect to only check whether it's defined. This is a correction to commit 661d603b65385f62f372acd2017e5af2e0f0cd50.
-rw-r--r--src/flexdef.h6
-rw-r--r--src/main.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/src/flexdef.h b/src/flexdef.h
index b4981c4..a48c64d 100644
--- a/src/flexdef.h
+++ b/src/flexdef.h
@@ -76,8 +76,10 @@
#include <strings.h>
#include "flexint.h"
-/* We use gettext. So, when we write strings which should be translated, we mark them with _() */
-#ifdef ENABLE_NLS
+/* We use gettext. So, when we write strings which should be translated, we
+ * mark them with _()
+ */
+#if defined(ENABLE_NLS) && ENABLE_NLS
#ifdef HAVE_LOCALE_H
#include <locale.h>
#endif /* HAVE_LOCALE_H */
diff --git a/src/main.c b/src/main.c
index 65285a0..a4047d7 100644
--- a/src/main.c
+++ b/src/main.c
@@ -197,7 +197,7 @@ int flex_main (int argc, char *argv[])
/* Wrapper around flex_main, so flex_main can be built as a library. */
int main (int argc, char *argv[])
{
-#ifdef ENABLE_NLS
+#if defined(ENABLE_NLS) && ENABLE_NLS
#if HAVE_LOCALE_H
setlocale (LC_MESSAGES, "");
setlocale (LC_CTYPE, "");