anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added missing cmakedefines to intl

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38724 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Kornel Benko 2011-05-12 17:12:08 +00:00
parent 896536256e
commit 583627bfb4
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
development/cmake/intl/libgnuintl.h → development/cmake/intl/libgnuintl.h.cmake
View File

@ -19,6 +19,10 @@
#ifndef _LIBINTL_H
#define _LIBINTL_H 1
#cmakedefine01 HAVE_POSIX_PRINTF
#cmakedefine01 HAVE_ASPRINTF
#cmakedefine01 HAVE_WPRINTF
#include <locale.h>
/* The LC_MESSAGES locale category is the category used by the functions
@ -52,6 +56,11 @@ extern "C" {
#endif
/* Version number: (major<<16) + (minor<<8) + subminor */
#define LIBINTL_VERSION 0x001000
extern int libintl_version;
/* We redirect the functions to those prefixed with "libintl_". This is
necessary, because some systems define gettext/textdomain/... in the C
library (namely, Solaris 2.4 and newer, and GNU libc 2.0 and newer).
@ -217,6 +226,8 @@ extern char *dcngettext (const char *__domainname,
#endif
#ifndef IN_LIBGLOCALE
/* Set the current default message catalog to DOMAINNAME.
If DOMAINNAME is null, return the current default.
If DOMAINNAME is "", reset to the default of "messages". */
@ -271,6 +282,8 @@ extern char *bind_textdomain_codeset (const char *__domainname,
_INTL_ASM (libintl_bind_textdomain_codeset);
#endif
#endif /* IN_LIBGLOCALE */
/* Support for format strings with positions in *printf(), following the
POSIX/XSI specification.
@ -300,6 +313,12 @@ extern int fprintf (FILE *, const char *, ...);
extern int vfprintf (FILE *, const char *, va_list);
#undef printf
#if defined __NetBSD__ || defined __CYGWIN__ || defined __MINGW32__
/* Don't break __attribute__((format(printf,M,N))).
This redefinition is only possible because the libc in NetBSD, Cygwin,
mingw does not have a function __printf__. */
# define libintl_printf __printf__
#endif
#define printf libintl_printf
extern int printf (const char *, ...);
#undef vprintf

4
intl/CMakeLists.txt
View File

@ -7,8 +7,8 @@
project(intl)
# libgnuintl.h.in => libintl.h
configure_file("${TOP_SRC_DIR}/${LYX_CMAKE_DIR}/intl/libgnuintl.h" ${CMAKE_CURRENT_BINARY_DIR}/libgnuintl.h COPYONLY)
configure_file("${TOP_SRC_DIR}/${LYX_CMAKE_DIR}/intl/libgnuintl.h" ${CMAKE_CURRENT_BINARY_DIR}/libintl.h COPYONLY)
configure_file("${TOP_SRC_DIR}/${LYX_CMAKE_DIR}/intl/libgnuintl.h.cmake" ${CMAKE_CURRENT_BINARY_DIR}/libgnuintl.h)
configure_file("${TOP_SRC_DIR}/${LYX_CMAKE_DIR}/intl/libgnuintl.h.cmake" ${CMAKE_CURRENT_BINARY_DIR}/libintl.h)
add_definitions(