diff options
author | Matt Wilson <msw@redhat.com> | 2002-12-16 20:42:45 +0000 |
---|---|---|
committer | Matt Wilson <msw@redhat.com> | 2002-12-16 20:42:45 +0000 |
commit | b23198893463a137a9ec039377eb35dece703196 (patch) | |
tree | 5701d09ac51c02da2b6e5f7891c374425b2e53a9 | |
parent | 875b4157dfffecf163c06247bf33a70136b85fe2 (diff) | |
download | anaconda-b23198893463a137a9ec039377eb35dece703196.tar.gz anaconda-b23198893463a137a9ec039377eb35dece703196.tar.xz anaconda-b23198893463a137a9ec039377eb35dece703196.zip |
require new version of bogl that does not do atexit() stuff, enable bogl
-rw-r--r-- | anaconda.spec.in | 2 | ||||
-rw-r--r-- | isys/gzlib/binding.c | 4 | ||||
-rw-r--r-- | loader2/dietstubs.c | 3 | ||||
-rw-r--r-- | loader2/lang.c | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/anaconda.spec.in b/anaconda.spec.in index 10fb6aea6..0c3cb8299 100644 --- a/anaconda.spec.in +++ b/anaconda.spec.in @@ -8,7 +8,7 @@ License: GPL Summary: The Red Hat Linux installation program. Group: Applications/System Source: anaconda-%{PACKAGE_VERSION}.tar.bz2 -BuildPreReq: pump-devel, kudzu-devel, pciutils-devel, bzip2-devel, e2fsprogs-devel, python-devel gtk2-devel rpm-python, newt-devel, rpm-devel, gettext >= 0.11, modutils-devel, rhpl, booty, libxml2-python, zlib-devel, bogl >= 0.1.9-9 +BuildPreReq: pump-devel, kudzu-devel, pciutils-devel, bzip2-devel, e2fsprogs-devel, python-devel gtk2-devel rpm-python, newt-devel, rpm-devel, gettext >= 0.11, modutils-devel, rhpl, booty, libxml2-python, zlib-devel, bogl >= 0.1.9-10 %ifnarch s390 s390x BuildPreReq: dietlibc %endif diff --git a/isys/gzlib/binding.c b/isys/gzlib/binding.c index 55e512d26..cdfccbaaa 100644 --- a/isys/gzlib/binding.c +++ b/isys/gzlib/binding.c @@ -52,7 +52,7 @@ gzFile gunzip_open(const char * file) { gzFile rc; fd = open(file, O_RDONLY); - if (fd < 0) return NULL; + if (fd == -1) return NULL; rc = gunzip_dopen(fd); close(fd); @@ -100,7 +100,7 @@ gzFile gzip_open(const char * file, int flags, int perms) { gzFile rc; fd = open(file, flags, perms); - if (fd < 0) return NULL; + if (fd == -1) return NULL; rc = gzip_dopen(fd); close(fd); diff --git a/loader2/dietstubs.c b/loader2/dietstubs.c index 49bef28b0..755ad3ed1 100644 --- a/loader2/dietstubs.c +++ b/loader2/dietstubs.c @@ -192,6 +192,7 @@ char *setlocale (int category, const char *locale) { return 0; } +#ifdef GZLIB void *gzopen(const char *file) { return gunzip_open(file); } @@ -203,4 +204,4 @@ int gzread(void *str, void * buf, int bytes) { int gzclose(void *str) { return gunzip_close(str); } - +#endif diff --git a/loader2/lang.c b/loader2/lang.c index b9708a472..44b7df48c 100644 --- a/loader2/lang.c +++ b/loader2/lang.c @@ -299,7 +299,7 @@ int chooseLanguage(char ** lang, int flags) { /* load the language only if it is displayable */ /* disable until working */ - if (!strcmp(languages[choice].font, "bterm") && (1 || startBterm(flags))) { + if (!strcmp(languages[choice].font, "bterm") && startBterm(flags)) { newtWinMessage("Language Unavailable", "OK", "%s display is unavailable in text mode. The " "installation will continue in English until the " |