diff options
author | Ted Unangst <tedu@cvs.openbsd.org> | 2015-11-19 23:40:17 +0000 |
---|---|---|
committer | Ted Unangst <tedu@cvs.openbsd.org> | 2015-11-19 23:40:17 +0000 |
commit | 0d6d974113b5079c85ca6736bf970262e637ea5c (patch) | |
tree | e568274ec60d7ac9ff7e806076d953d15e386b72 /usr.bin/lex | |
parent | 6293def716f79dd5724c8250e588162739f51544 (diff) |
remove the LGPL gettext.h since we aren't using it anyway.
spotted by nicm
Diffstat (limited to 'usr.bin/lex')
-rw-r--r-- | usr.bin/lex/flexdef.h | 11 | ||||
-rw-r--r-- | usr.bin/lex/gettext.h | 61 |
2 files changed, 1 insertions, 71 deletions
diff --git a/usr.bin/lex/flexdef.h b/usr.bin/lex/flexdef.h index f44f0fb8991..bb71ba03015 100644 --- a/usr.bin/lex/flexdef.h +++ b/usr.bin/lex/flexdef.h @@ -1,4 +1,4 @@ -/* $OpenBSD: flexdef.h,v 1.13 2015/11/19 23:34:56 mmcc Exp $ */ +/* $OpenBSD: flexdef.h,v 1.14 2015/11/19 23:40:16 tedu Exp $ */ /* flexdef - definitions file for flex */ @@ -97,16 +97,7 @@ char *alloca (); #endif #include "flexint.h" -/* We use gettext. So, when we write strings which should be translated, we mark them with _() */ -#ifdef ENABLE_NLS -#ifdef HAVE_LOCALE_H -#include <locale.h> -#endif /* HAVE_LOCALE_H */ -#include "gettext.h" -#define _(String) gettext (String) -#else #define _(STRING) STRING -#endif /* ENABLE_NLS */ /* Always be prepared to generate an 8-bit scanner. */ #define CSIZE 256 diff --git a/usr.bin/lex/gettext.h b/usr.bin/lex/gettext.h deleted file mode 100644 index a4322379a5d..00000000000 --- a/usr.bin/lex/gettext.h +++ /dev/null @@ -1,61 +0,0 @@ -/* $OpenBSD: gettext.h,v 1.1 2015/11/19 19:43:40 tedu Exp $ */ - -/* Convenience header for conditional use of GNU <libintl.h>. - Copyright (C) 1995-1998, 2000-2002 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU Library General Public License as published - by the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - USA. */ - -#ifndef _LIBGETTEXT_H -#define _LIBGETTEXT_H 1 - -/* NLS can be disabled through the configure --disable-nls option. */ -#if ENABLE_NLS - -/* Get declarations of GNU message catalog functions. */ -# include <libintl.h> - -#else - -/* Disabled NLS. - The casts to 'const char *' serve the purpose of producing warnings - for invalid uses of the value returned from these functions. - On pre-ANSI systems without 'const', the config.h file is supposed to - contain "#define const". */ -# define gettext(Msgid) ((const char *) (Msgid)) -# define dgettext(Domainname, Msgid) ((const char *) (Msgid)) -# define dcgettext(Domainname, Msgid, Category) ((const char *) (Msgid)) -# define ngettext(Msgid1, Msgid2, N) \ - ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2)) -# define dngettext(Domainname, Msgid1, Msgid2, N) \ - ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2)) -# define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \ - ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2)) -# define textdomain(Domainname) ((const char *) (Domainname)) -# define bindtextdomain(Domainname, Dirname) ((const char *) (Dirname)) -# define bind_textdomain_codeset(Domainname, Codeset) ((const char *) (Codeset)) - -#endif - -/* A pseudo function call that serves as a marker for the automated - extraction of messages, but does not call gettext(). The run-time - translation is done at a different place in the code. - The argument, String, should be a literal string. Concatenated strings - and other string expressions won't work. - The macro's expansion is not parenthesized, so that it is suitable as - initializer for static 'char[]' or 'const char[]' variables. */ -#define gettext_noop(String) String - -#endif /* _LIBGETTEXT_H */ |