diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2009-08-06 08:17:09 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2009-08-06 08:44:53 +1000 |
| commit | 64e2b859d2ed9c2428219617c3864c64cd6ed909 (patch) | |
| tree | 5bd71240e2facda348f3dc1dc843bd0b769c3e5f /source4/heimdal/kuser | |
| parent | b97d85c5e4db00a6cfc0a191907e88d2623c6681 (diff) | |
| download | samba-64e2b859d2ed9c2428219617c3864c64cd6ed909.tar.gz samba-64e2b859d2ed9c2428219617c3864c64cd6ed909.tar.bz2 samba-64e2b859d2ed9c2428219617c3864c64cd6ed909.zip | |
s4:heimdal: import lorikeet-heimdal-200908052208 (commit 370a73a74199a5a55188340906e15fd795f67a74)
This removes some of the portability changes made to code under
heimdal/
If these are still required, then we will re-add them with code under
heimdal_build/ (so that we can simply 'drop in' future heimdal
releases).
Andrew Bartlett
Diffstat (limited to 'source4/heimdal/kuser')
| -rw-r--r-- | source4/heimdal/kuser/kinit.c | 2 | ||||
| -rw-r--r-- | source4/heimdal/kuser/kuser_locl.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/source4/heimdal/kuser/kinit.c b/source4/heimdal/kuser/kinit.c index 350988dbac..4208fa83e0 100644 --- a/source4/heimdal/kuser/kinit.c +++ b/source4/heimdal/kuser/kinit.c @@ -768,10 +768,8 @@ main (int argc, char **argv) setprogname (argv[0]); setlocale (LC_ALL, ""); -#if defined(HEIMDAL_LOCALEDIR) bindtextdomain ("heimdal_kuser", HEIMDAL_LOCALEDIR); textdomain("heimdal_kuser"); -#endif ret = krb5_init_context (&context); if (ret == KRB5_CONFIG_BADFORMAT) diff --git a/source4/heimdal/kuser/kuser_locl.h b/source4/heimdal/kuser/kuser_locl.h index eafffe9bff..1bf682b1d0 100644 --- a/source4/heimdal/kuser/kuser_locl.h +++ b/source4/heimdal/kuser/kuser_locl.h @@ -88,7 +88,7 @@ #include <locale.h> #endif -#ifdef HAVE_LIBINTL_H +#ifdef LIBINTL #include <libintl.h> #define N_(x,y) gettext(x) #define NP_(x,y) (x) |