diff options
| author | Andrew Tridgell <tridge@samba.org> | 2001-10-14 12:10:29 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2001-10-14 12:10:29 +0000 |
| commit | a689b24db14436ab1faa2f2f79b9f27b777b1fdb (patch) | |
| tree | 7195ae4dc635d1f2e18b44ae57408b03e99e7c63 /source3/include | |
| parent | 47a0b69029857e92703ca5b00022dcfcb179c9c7 (diff) | |
| download | samba-a689b24db14436ab1faa2f2f79b9f27b777b1fdb.tar.gz samba-a689b24db14436ab1faa2f2f79b9f27b777b1fdb.tar.bz2 samba-a689b24db14436ab1faa2f2f79b9f27b777b1fdb.zip | |
the next step in the intl changeover. This should get us compiling agian,
and also completes the switch to lang_tdb.c. SWAT should now work
with a po file in the lib/ directory
also removed useless SYSLOG defines in many files
(This used to be commit 5296b20ad85d7519c870768455cb4d8df048c55a)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/includes.h | 1 | ||||
| -rw-r--r-- | source3/include/webintl.h | 52 |
2 files changed, 1 insertions, 52 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index a268519488..3a6282a006 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -627,6 +627,7 @@ extern int errno; /* Lists, trees, caching, database... */ #include "xfile.h" +#include "intl.h" #include "ubi_sLinkList.h" #include "ubi_dLinkList.h" #include "dlinklist.h" diff --git a/source3/include/webintl.h b/source3/include/webintl.h deleted file mode 100644 index 12626a5f19..0000000000 --- a/source3/include/webintl.h +++ /dev/null @@ -1,52 +0,0 @@ -#ifndef I18N_H_INCLUDED -#define I18N_H_INCLUDED 1 - -/* - * I18N_ORIGINAL_LANG ...the language of the original document files (*.html). - */ -#define I18N_ORIGINAL_LANG "en" - -/* these constants are defined in Makefile. - * - * I18N_PACKAGE ...package name "i18n_swat" defined in configure.in. - * I18N_LOCALEDIR ...directory to put message catalogs. - * I18N_LOCALE_FILE ...filename of the language-locale map file. - */ - -#ifdef ENABLE_NLS -#define I18N_GETTEXT 1 -#endif /* ENABLE_NLS */ - -/* if NLS is disabled (ENABLE_NLS == 0), configure script will - * automatically creates intl/libintl.h -> intl/libgettext.h (symlink) - * and gettext(str) is defined as (str) in that file. - */ -#include <libintl.h> -#define _(String) gettext(String) -#define N_(String) (String) - -#if I18N_SWAT -#define LN_(fname) ln_get_pref_file_n_o(fname) -#else -#define LN_(fname) (fname) -#endif /* I18N_SWAT */ - -/* global function pointers defined in kanji.c. */ -extern char *(*dos_to_dos)(char *to, const char *from); - -/* ****************************************************************** - * macros for debugging. - ***************************************************************** */ -#define LN_R_NODEBUG 1 -#ifdef LN_R_NODEBUG -#define rassert(b) (void)0 -#define rstrace(s) (void)0 - -#else -void ln_debug_error(const char *info, int nLine); -void rassert_help(BOOL b, int l); -#define rassert(b) rassert_help((BOOL)(b), (__LINE__)) -#define rstrace(s) ln_debug_error((s), (__LINE__)) -#endif /* LN_R_NODEBUG */ - -#endif /* I18N_H_INCLUDED */ |