dlugolecki.net.pl
Dziennik
Polecane
Software
projects
/
gedcom-parse.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Portability fixes.
[gedcom-parse.git]
/
intl
/
gettext.c
diff --git
a/intl/gettext.c
b/intl/gettext.c
index d929f98d68ac0f5d8f11d180f74ab3f134cce145..a64020553ad8fd0e7578c623ac7ff4b41c450bbd 100644
(file)
--- a/
intl/gettext.c
+++ b/
intl/gettext.c
@@
-1,5
+1,5
@@
/* Implementation of gettext(3) function.
/* Implementation of gettext(3) function.
- Copyright (C) 1995, 1997 Free Software Foundation, Inc.
+ Copyright (C) 1995, 1997
, 2000, 2001
Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-23,21
+23,14
@@
# define __need_NULL
# include <stddef.h>
#else
# define __need_NULL
# include <stddef.h>
#else
-# ifdef STDC_HEADERS
-# include <stdlib.h> /* Just for NULL. */
-# else
-# ifdef HAVE_STRING_H
-# include <string.h>
-# else
-# define NULL ((void *) 0)
-# endif
-# endif
+# include <stdlib.h> /* Just for NULL. */
#endif
#endif
+#include "gettextP.h"
#ifdef _LIBC
# include <libintl.h>
#else
#ifdef _LIBC
# include <libintl.h>
#else
-# include "libg
ettext
.h"
+# include "libg
nuintl
.h"
#endif
/* @@ end of prolog @@ */
#endif
/* @@ end of prolog @@ */
@@
-48,10
+41,10
@@
prefix. So we have to make a difference here. */
#ifdef _LIBC
# define GETTEXT __gettext
prefix. So we have to make a difference here. */
#ifdef _LIBC
# define GETTEXT __gettext
-# define D
GETTEXT __d
gettext
+# define D
CGETTEXT __dc
gettext
#else
# define GETTEXT gettext__
#else
# define GETTEXT gettext__
-# define D
GETTEXT d
gettext__
+# define D
CGETTEXT dc
gettext__
#endif
/* Look up MSGID in the current default message catalog for the current
#endif
/* Look up MSGID in the current default message catalog for the current
@@
-61,7
+54,7
@@
char *
GETTEXT (msgid)
const char *msgid;
{
GETTEXT (msgid)
const char *msgid;
{
- return D
GETTEXT (NULL, msgid
);
+ return D
CGETTEXT (NULL, msgid, LC_MESSAGES
);
}
#ifdef _LIBC
}
#ifdef _LIBC