Clean up includes for gettext

It is always enabled.
This commit is contained in:
TingPing 2014-06-21 23:10:18 -04:00
parent 47b4b0da8a
commit c3c6b46230
3 changed files with 2 additions and 30 deletions

View File

@ -843,7 +843,6 @@ echo D-Bus support ......... : $dbus
echo libnotify support ..... : $libnotify echo libnotify support ..... : $libnotify
echo libcanberra support ... : $libcanberra echo libcanberra support ... : $libcanberra
echo Plugin interface ...... : $plugin echo Plugin interface ...... : $plugin
echo NLS/gettext ........... : $USE_NLS
echo IPv6 support .......... : $ipv6 echo IPv6 support .......... : $ipv6
echo MS Proxy NTLM \(ISA\) ... : $have_ntlm echo MS Proxy NTLM \(ISA\) ... : $have_ntlm
echo libproxy support ...... : $libproxy echo libproxy support ...... : $libproxy

View File

@ -21,6 +21,7 @@
#include <glib.h> #include <glib.h>
#include <glib/gstdio.h> #include <glib/gstdio.h>
#include <glib/gi18n.h>
#include <time.h> /* need time_t */ #include <time.h> /* need time_t */
@ -92,20 +93,6 @@
#define USERNAMELEN 10 #define USERNAMELEN 10
#define HIDDEN_CHAR 8 /* invisible character for xtext */ #define HIDDEN_CHAR 8 /* invisible character for xtext */
#if defined(ENABLE_NLS) && !defined(_)
# include <libintl.h>
# define _(x) gettext(x)
# ifdef gettext_noop
# define N_(String) gettext_noop (String)
# else
# define N_(String) (String)
# endif
#endif
#if !defined(_)
# define N_(String) (String)
# define _(x) (x)
#endif
struct nbexec struct nbexec
{ {
int myfd; int myfd;

View File

@ -28,21 +28,7 @@
#include <sys/types.h> #include <sys/types.h>
#endif #endif
#if defined(ENABLE_NLS) && !defined(_) #include <glib/gi18n.h>
# include <libintl.h>
# define _(x) gettext(x)
# ifdef gettext_noop
# define N_(String) gettext_noop (String)
# else
# define N_(String) (String)
# endif
#endif
#if !defined(ENABLE_NLS) && defined(_)
# undef _
# define N_(String) (String)
# define _(x) (x)
#endif
#include <gtk/gtk.h> #include <gtk/gtk.h>
#ifdef HAVE_GTK_MAC #ifdef HAVE_GTK_MAC