[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
CVS: a2ps/lib encoding.c,1.2,1.3 gettext.h,1.2,1.3
From: |
Akim Demaille <address@hidden> |
Subject: |
CVS: a2ps/lib encoding.c,1.2,1.3 gettext.h,1.2,1.3 |
Date: |
Mon, 02 Sep 2002 08:46:40 -0400 |
Update of /cvsroot/a2ps/a2ps/lib
In directory subversions:/tmp/cvs-serv28629/lib
Modified Files:
encoding.c gettext.h
Log Message:
Gettext 0.11.5.
* configure.in (AM_GNU_GETTEXT_VERSION): New macro, replacing
GETTEXT_VERSION var.
Bump version to 0.11.5.
(AM_GNU_GETTEXT): Use external gettext.
(AC_OUTPUT): Remove intl/Makefile.
(AC_CHECK_FUNCS): Add setlocale.
(SUBDIRS): Remove intl.
Index: encoding.c
===================================================================
RCS file: /cvsroot/a2ps/a2ps/lib/encoding.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** encoding.c 22 Mar 2002 14:53:13 -0000 1.2
--- encoding.c 2 Sep 2002 12:46:38 -0000 1.3
***************
*** 3,9 ****
*
* definition of the char encodings used
! * Copyright (c) 1988-1993 Miguel Santana
! * Copyright (c) 1995-1999 Akim Demaille, Miguel Santana
! * $Id$
*/
--- 3,8 ----
*
* definition of the char encodings used
! * Copyright (C) 1988-1993 Miguel Santana
! * Copyright (C) 1995-1999, 2002 Akim Demaille, Miguel Santana
*/
Index: gettext.h
===================================================================
RCS file: /cvsroot/a2ps/a2ps/lib/gettext.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** gettext.h 18 Apr 2002 16:52:33 -0000 1.2
--- gettext.h 2 Sep 2002 12:46:38 -0000 1.3
***************
*** 28,31 ****
--- 28,41 ----
#else
+ /* Solaris /usr/include/locale.h includes /usr/include/libintl.h, which
+ chokes if dcgettext is defined as a macro. So include it now, to make
+ later inclusions of <locale.h> a NOP. We don't include <libintl.h>
+ as well because people using "gettext.h" will not include <libintl.h>,
+ and also including <libintl.h> would fail on SunOS 4, whereas <locale.h>
+ is OK. */
+ #if defined(__sun)
+ # include <locale.h>
+ #endif
+
/* Disabled NLS.
The casts to 'const char *' serve the purpose of producing warnings
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- CVS: a2ps/lib encoding.c,1.2,1.3 gettext.h,1.2,1.3,
Akim Demaille <address@hidden> <=
- Prev by Date:
CVS: a2ps/m4 .cvsignore,1.1,1.2
- Next by Date:
CVS: a2ps ChangeLog,1.16,1.17 Makefile.am,1.5,1.6 README-cvs,1.3,1.4 configure.in,1.5,1.6
- Previous by thread:
CVS: a2ps/m4 .cvsignore,1.1,1.2
- Next by thread:
CVS: a2ps ChangeLog,1.16,1.17 Makefile.am,1.5,1.6 README-cvs,1.3,1.4 configure.in,1.5,1.6
- Index(es):