From 497a3fbaa1ea089ec926a122fb833df320066efc Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Fri, 21 Sep 2018 19:03:33 +0200 Subject: Fix --no-nls (2/5), prefer #if in libs This is for consistency with system-wide gettext.h which is used by some 3rd party libs. system-wide gettext uses `#if ENABLE_NLS`, not #ifdef --- libs/ardour/gettext.h | 2 +- libs/ardour/globals.cc | 2 +- libs/gtkmm2ext/gettext.h | 2 +- libs/gtkmm2ext/utils.cc | 2 +- libs/pbd/gettext.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/ardour/gettext.h b/libs/ardour/gettext.h index 2645402e95..339c74ffe7 100644 --- a/libs/ardour/gettext.h +++ b/libs/ardour/gettext.h @@ -20,7 +20,7 @@ #define _LIBGETTEXT_H 1 /* NLS can be disabled through the configure --disable-nls option. */ -#ifdef ENABLE_NLS +#if ENABLE_NLS /* Get declarations of GNU message catalog functions. */ # include diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc index e3e24378c5..fc17b3a5e9 100644 --- a/libs/ardour/globals.cc +++ b/libs/ardour/globals.cc @@ -444,7 +444,7 @@ ARDOUR::init (bool use_windows_vst, bool try_optimization, const char* localedir if (!PBD::init()) return false; -#ifdef ENABLE_NLS +#if ENABLE_NLS (void) bindtextdomain(PACKAGE, localedir); (void) bind_textdomain_codeset (PACKAGE, "UTF-8"); #endif diff --git a/libs/gtkmm2ext/gettext.h b/libs/gtkmm2ext/gettext.h index 2645402e95..339c74ffe7 100644 --- a/libs/gtkmm2ext/gettext.h +++ b/libs/gtkmm2ext/gettext.h @@ -20,7 +20,7 @@ #define _LIBGETTEXT_H 1 /* NLS can be disabled through the configure --disable-nls option. */ -#ifdef ENABLE_NLS +#if ENABLE_NLS /* Get declarations of GNU message catalog functions. */ # include diff --git a/libs/gtkmm2ext/utils.cc b/libs/gtkmm2ext/utils.cc index 147256b426..06cd0b82a9 100644 --- a/libs/gtkmm2ext/utils.cc +++ b/libs/gtkmm2ext/utils.cc @@ -44,7 +44,7 @@ using namespace std; void Gtkmm2ext::init (const char* localedir) { -#ifdef ENABLE_NLS +#if ENABLE_NLS (void) bindtextdomain(PACKAGE, localedir); (void) bind_textdomain_codeset (PACKAGE, "UTF-8"); #endif diff --git a/libs/pbd/gettext.h b/libs/pbd/gettext.h index 2645402e95..339c74ffe7 100644 --- a/libs/pbd/gettext.h +++ b/libs/pbd/gettext.h @@ -20,7 +20,7 @@ #define _LIBGETTEXT_H 1 /* NLS can be disabled through the configure --disable-nls option. */ -#ifdef ENABLE_NLS +#if ENABLE_NLS /* Get declarations of GNU message catalog functions. */ # include -- cgit v1.2.3