projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Include gettext.h instead of <libintl.h> with #ifdefs.
[gnulib.git]
/
lib
/
obstack.c
diff --git
a/lib/obstack.c
b/lib/obstack.c
index
0244da3
..
0ef6c91
100644
(file)
--- a/
lib/obstack.c
+++ b/
lib/obstack.c
@@
-1,5
+1,5
@@
/* obstack.c - subroutines used implicitly by object stack macros
/* obstack.c - subroutines used implicitly by object stack macros
- Copyright (C) 1988-1994,
96,97,98,99,2000,2001
Free Software Foundation, Inc.
+ Copyright (C) 1988-1994,
1996-1999, 2000-2002
Free Software Foundation, Inc.
This file is part of the GNU C Library. Its master source is NOT part of
the C library, however. The master source lives in /gd/gnu/lib.
This file is part of the GNU C Library. Its master source is NOT part of
the C library, however. The master source lives in /gd/gnu/lib.
@@
-458,16
+458,13
@@
_obstack_memory_used (h)
}
\f
/* Define the error handler. */
}
\f
/* Define the error handler. */
-# ifndef _
-# if (HAVE_LIBINTL_H && ENABLE_NLS) || defined _LIBC
-# include <libintl.h>
-# ifndef _
-# define _(Str) gettext (Str)
-# endif
-# else
-# define _(Str) (Str)
-# endif
+# ifdef _LIBC
+# include <libintl.h>
+# else
+# include "gettext.h"
# endif
# endif
+# define _(msgid) gettext (msgid)
+
# if defined _LIBC && defined USE_IN_LIBIO
# include <libio/iolibio.h>
# define fputs(s, f) _IO_fputs (s, f)
# if defined _LIBC && defined USE_IN_LIBIO
# include <libio/iolibio.h>
# define fputs(s, f) _IO_fputs (s, f)