diff options
| author | Jeremy Katz <katzj@redhat.com> | 2005-12-08 21:17:03 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2005-12-08 21:17:03 +0000 |
| commit | b44abe3ec1e9c77e606aaf640e0e563bac8ed66e (patch) | |
| tree | c5b2a13ea16845c5774e463229468a9243c4894c /loader2 | |
| parent | cef7c66e5c517c8b5057ceb3a90f4939bf531264 (diff) | |
| download | anaconda-b44abe3ec1e9c77e606aaf640e0e563bac8ed66e.tar.gz anaconda-b44abe3ec1e9c77e606aaf640e0e563bac8ed66e.tar.xz anaconda-b44abe3ec1e9c77e606aaf640e0e563bac8ed66e.zip | |
2005-12-08 Jeremy Katz <katzj@redhat.com>
* loader2/loader.c: remove slang hack
* loader2/wcstubs.c (nl_langinfo): We can't do this in a
statically linked binary, so lie to slang some more.
Diffstat (limited to 'loader2')
| -rw-r--r-- | loader2/loader.c | 6 | ||||
| -rw-r--r-- | loader2/wcstubs.c | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/loader2/loader.c b/loader2/loader.c index c9cbab35f..a1797d7d8 100644 --- a/loader2/loader.c +++ b/loader2/loader.c @@ -35,9 +35,6 @@ #include <syslog.h> #include <unistd.h> -/* I hate slang */ -#include <slang/slang.h> - #include <sys/ioctl.h> #include <sys/types.h> #include <sys/stat.h> @@ -207,9 +204,6 @@ void initializeConsole(moduleList modLoaded, moduleDeps modDeps, printf("\033%%G"); fflush(stdout); - /* hack around the fact that slang doesn't auto-set UTF-8 mode #174761 */ - SLutf8_enable(1); - isysLoadFont(); if (!FL_TESTING(flags)) isysSetUnicodeKeymap(); diff --git a/loader2/wcstubs.c b/loader2/wcstubs.c index a6fdb5ca6..f0725e7f3 100644 --- a/loader2/wcstubs.c +++ b/loader2/wcstubs.c @@ -61,6 +61,11 @@ char * setlocale (int category, const char *locale) { return 0; } +/* lie to slang some more */ +char * nl_langinfo(int item) { + return NULL; +} + # define __libc_freeres_fn_section \ __attribute__ ((section ("__libc_freeres_fn"))) |