From 7d4343d0d05ce69e0a72da5ac34eea415d4c789f Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Tue, 12 Feb 2002 02:34:44 -0500 Subject: Lots of small random portability fixes to make e2fsprogs build under AIX --- even without the 5L compatibility toolkit, and even using the uber-crippled AIX native C compiler. --- misc/ChangeLog | 9 +++++++++ misc/Makefile.in | 3 ++- misc/get_device_by_label.c | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) (limited to 'misc') diff --git a/misc/ChangeLog b/misc/ChangeLog index 1ef6f3b4..2774a5de 100644 --- a/misc/ChangeLog +++ b/misc/ChangeLog @@ -1,3 +1,12 @@ +2002-02-12 Theodore Tso + + * get_device_by_label.c: Since on non-STDC compilers, we define + away const, include get_device_by_label.h after we include + fsck.h. + + * Makefile.in (base_device): Remove use of $<, which is + non-portable. + 2002-02-03 Theodore Tso * Release of E2fsprogs 1.26 diff --git a/misc/Makefile.in b/misc/Makefile.in index e922ffab..6a16a11e 100644 --- a/misc/Makefile.in +++ b/misc/Makefile.in @@ -62,7 +62,8 @@ e2image: $(E2IMAGE_OBJS) $(DEPLIBS) $(CC) $(ALL_LDFLAGS) -o e2image $(E2IMAGE_OBJS) $(LIBS) base_device: base_device.c - $(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) $< -DDEBUG -o $@ + $(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(srcdir)/base_device.c \ + -DDEBUG -o base_device fstype: fstype.c $(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) -DTEST_PROGRAM $(srcdir)/fstype.c \ diff --git a/misc/get_device_by_label.c b/misc/get_device_by_label.c index 9223fcf6..3f68dd86 100644 --- a/misc/get_device_by_label.c +++ b/misc/get_device_by_label.c @@ -30,8 +30,8 @@ #endif #include #include "nls-enable.h" -#include "get_device_by_label.h" #include "fsck.h" +#include "get_device_by_label.h" /* function prototype from libext2 */ extern char *ext2fs_find_block_device(dev_t device); -- cgit v1.2.3