From 0b2b6207c24bfab3878185d1f907fd0d960931da Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Tue, 19 Oct 2021 00:06:23 +0200 Subject: Factor out i18n stuff into separate i18n.h files Factor out the i18n definitions into i18n.h include files: One include file each for libgphoto2 and for libgphoto2_port. This removes the complete #ifdef ENABLE_NLS # include # undef _ # define _(String) dgettext (GETTEXT_PACKAGE, String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else # define N_(String) (String) # endif #else # define _(String) (String) # define N_(String) (String) #endif block (which in some occasions defines even more macros) and replaces it with a single line #include "libgphoto2/i18n.h" for camlibs and libgphoto2 itself and with #include "libgphoto2_port/i18n.h" for iolibs and libgphoto2_port itself. This gives us two central locations to change the defintions. --- camlibs/pentax/library.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'camlibs/pentax') diff --git a/camlibs/pentax/library.c b/camlibs/pentax/library.c index 67d620c5d..65595afb9 100644 --- a/camlibs/pentax/library.c +++ b/camlibs/pentax/library.c @@ -35,21 +35,11 @@ #include #include #include + +#include "libgphoto2/i18n.h" + #include "pslr.h" -#ifdef ENABLE_NLS -# include -# undef _ -# define _(String) dgettext (GETTEXT_PACKAGE, String) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define _(String) (String) -# define N_(String) (String) -#endif bool debug = true; -- cgit v1.2.1