Thu, 06 Feb 2014 14:16:13 +0000
locale.h name seems to conflict with system locale.h name on some systems
locale.h | file | annotate | diff | comparison | revisions | |
localex.h | file | annotate | diff | comparison | revisions | |
prefix.c | file | annotate | diff | comparison | revisions | |
system.mk | file | annotate | diff | comparison | revisions | |
util.c | file | annotate | diff | comparison | revisions |
--- a/locale.h Fri Mar 15 10:12:47 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,27 +0,0 @@ -/* - * libtu/locale.h - * - * Copyright (c) Tuomo Valkonen 2004. - * - * You may distribute and modify this library under the terms of either - * the Clarified Artistic License or the GNU LGPL, version 2.1 or later. - */ - -#ifndef LIBTU_LOCALE_H -#define LIBTU_LOCALE_H - -#ifdef CF_NO_GETTEXT - -#define TR(X) X -#define DUMMY_TR(X) X - -#else - -#include <libintl.h> - -#define TR(X) gettext(X) -#define DUMMY_TR(X) X - -#endif - -#endif /* LIBTU_LOCALE_H */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/localex.h Thu Feb 06 14:16:13 2014 +0000 @@ -0,0 +1,27 @@ +/* + * libtu/locale.h + * + * Copyright (c) Tuomo Valkonen 2004. + * + * You may distribute and modify this library under the terms of either + * the Clarified Artistic License or the GNU LGPL, version 2.1 or later. + */ + +#ifndef LIBTU_LOCALE_H +#define LIBTU_LOCALE_H + +#ifdef CF_NO_GETTEXT + +#define TR(X) X +#define DUMMY_TR(X) X + +#else + +#include <libintl.h> + +#define TR(X) gettext(X) +#define DUMMY_TR(X) X + +#endif + +#endif /* LIBTU_LOCALE_H */
--- a/prefix.c Fri Mar 15 10:12:47 2013 +0000 +++ b/prefix.c Thu Feb 06 14:16:13 2014 +0000 @@ -9,7 +9,7 @@ #include <string.h> #include "misc.h" -#include "locale.h" +#include "localex.h" #include "output.h" static char *the_prefix=NULL;