diff options
| author | Jacob Leach <jleach@src.gnome.org> | 2000-04-06 01:40:08 +0000 |
|---|---|---|
| committer | Jacob Leach <jleach@src.gnome.org> | 2000-04-06 01:40:08 +0000 |
| commit | 5ee0a8275335a5b0f1deb19ac506bbe0f2e75a22 (patch) | |
| tree | e894d069a7b4d97661fdcecf2982903c04689819 /intl/libgettext.h | |
| parent | a30e996c94bdb971562811c4dab2fdd2cd457484 (diff) | |
| download | shared-mime-info-5ee0a8275335a5b0f1deb19ac506bbe0f2e75a22.tar.gz | |
Another bigger-than-probably-needs-to-be commit. All the file
renaming/removing should be completely done. Began glade-izing the
dialogs, glade is awesome. Improved the requirement checks in the
.spec and configure. Fixed a few crashes and then updated BUGS.
We're getting closer to a new stable release.
svn path=/trunk/; revision=1170
Diffstat (limited to 'intl/libgettext.h')
| -rw-r--r-- | intl/libgettext.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/intl/libgettext.h b/intl/libgettext.h index 72eef4a5..3a92960a 100644 --- a/intl/libgettext.h +++ b/intl/libgettext.h @@ -1,5 +1,5 @@ /* Message catalogs for internationalization. - Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1995, 1996, 1997, 1998 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 @@ -20,8 +20,8 @@ include protection above. But the systems header might perhaps also define _LIBINTL_H and therefore we have to protect the definition here. */ -#if !defined (_LIBINTL_H) || !defined (_LIBGETTEXT_H) -#if !defined (_LIBINTL_H) +#if !defined _LIBINTL_H || !defined _LIBGETTEXT_H +#ifndef _LIBINTL_H # define _LIBINTL_H 1 #endif #define _LIBGETTEXT_H 1 @@ -44,7 +44,7 @@ extern "C" { /* @@ end of prolog @@ */ #ifndef PARAMS -# if __STDC__ +# if __STDC__ || defined __cplusplus # define PARAMS(args) args # else # define PARAMS(args) () @@ -122,9 +122,6 @@ extern char *bindtextdomain__ PARAMS ((const char *__domainname, const char *__dirname)); #if ENABLE_NLS -#ifdef VFS_STANDALONE -#error This can never work -#endif /* Solaris 2.3 has the gettext function but dcgettext is missing. So we omit this optimization for Solaris 2.3. BTW, Solaris 2.4 @@ -171,8 +168,8 @@ extern int _nl_msg_cat_cntr; # define gettext(Msgid) (Msgid) # define dgettext(Domainname, Msgid) (Msgid) # define dcgettext(Domainname, Msgid, Category) (Msgid) -# define textdomain(Domainname) while (0) /* nothing */ -# define bindtextdomain(Domainname, Dirname) while (0) /* nothing */ +# define textdomain(Domainname) ((char *) Domainname) +# define bindtextdomain(Domainname, Dirname) ((char *) Dirname) #endif |