summaryrefslogtreecommitdiffstats
path: root/loader2/dietstubs.c
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2003-07-08 03:00:53 +0000
committerJeremy Katz <katzj@redhat.com>2003-07-08 03:00:53 +0000
commit459119c94529602d08de465b7ebfa4871d328081 (patch)
tree369a7eb643938d6d51ef6f2d0c46561e61dcc0ae /loader2/dietstubs.c
parent390977d3ee0ebc010168ce04573f63ae15458718 (diff)
downloadanaconda-459119c94529602d08de465b7ebfa4871d328081.tar.gz
anaconda-459119c94529602d08de465b7ebfa4871d328081.tar.xz
anaconda-459119c94529602d08de465b7ebfa4871d328081.zip
massive merge from taroon branch. changes are all over the place, but a
summary of looking through the diff is * clean up warnings, we build with -Wall -Werror here too * product.img stuff * max logical partitions enforcement * 1 TB max fs size * ethtool stuff * autopart in kickstart * driver disk fixes * RHEL upgrade stuff * network driver disks * variant pkgorder/tree splitting
Diffstat (limited to 'loader2/dietstubs.c')
-rw-r--r--loader2/dietstubs.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/loader2/dietstubs.c b/loader2/dietstubs.c
index ae0a3bf73..5d319bc61 100644
--- a/loader2/dietstubs.c
+++ b/loader2/dietstubs.c
@@ -5,6 +5,7 @@
#include <setjmp.h>
#include <ctype.h>
#include <stdarg.h>
+#include <unistd.h>
#ifdef GZLIB
#include "../isys/gzlib/gzlib.h"
#endif
@@ -158,10 +159,6 @@ void warn(char * format, ...) {
errno = err;
}
-int pwrite(int fd, const void *buf, size_t count, off_t offset) {
- return __pwrite(fd, buf, count, offset);
-}
-
void * __rawmemchr (void* s, int c) {
while (*(char *)s != c)
s++;
@@ -169,7 +166,7 @@ void * __rawmemchr (void* s, int c) {
}
char * dcgettext (const char *domainname, const char *msgid, int category) {
- return msgid;
+ return (char *) msgid;
}
int wcwidth (wchar_t c) {