diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2007-03-14 19:22:07 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2007-03-14 19:22:07 -0700 |
| commit | ab6acefe649751b072fd9be21ff5de7733c1370e (patch) | |
| tree | 7abe6b36fd8774cb758421bdcce6949b1782a5f7 /com32/libutil | |
| parent | 37b99c20bf10933524f3b8c1ec04215d5c94c18d (diff) | |
| download | syslinux-ab6acefe649751b072fd9be21ff5de7733c1370e.tar.gz | |
Move the loadfile() routine into the syslinux/ namespace, and use it.syslinux-3.40-pre13
- Move the loadfile() routine into <syslinux/loadfile.h>.
- Actually use the loadfile() routine.
Diffstat (limited to 'com32/libutil')
| -rw-r--r-- | com32/libutil/Makefile | 2 | ||||
| -rw-r--r-- | com32/libutil/include/syslinux/loadfile.h (renamed from com32/libutil/include/loadfile.h) | 0 | ||||
| -rw-r--r-- | com32/libutil/syslinux/loadfile.c (renamed from com32/libutil/loadfile.c) | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/com32/libutil/Makefile b/com32/libutil/Makefile index 3656fb3f..eaae4156 100644 --- a/com32/libutil/Makefile +++ b/com32/libutil/Makefile @@ -47,7 +47,7 @@ LNXSFLAGS = -g LNXLDFLAGS = -g OBJCOPY = objcopy LIBOBJS = ansiline.o ansiraw.o get_key.o idle.o sha1hash.o unbase64.o \ - movebits.o loadfile.o + syslinux/loadfile.o LNXLIBOBJS = $(patsubst %.o,%.lo,$(LIBOBJS)) .SUFFIXES: .lss .c .lo .o .elf .c32 .lnx diff --git a/com32/libutil/include/loadfile.h b/com32/libutil/include/syslinux/loadfile.h index fbda589d..fbda589d 100644 --- a/com32/libutil/include/loadfile.h +++ b/com32/libutil/include/syslinux/loadfile.h diff --git a/com32/libutil/loadfile.c b/com32/libutil/syslinux/loadfile.c index d9cfb3b7..9a4e3ca5 100644 --- a/com32/libutil/loadfile.c +++ b/com32/libutil/syslinux/loadfile.c @@ -23,7 +23,7 @@ #include <fcntl.h> #include <sys/stat.h> -#include "loadfile.h" +#include <syslinux/loadfile.h> int loadfile(const char *filename, void **ptr, size_t *len) { |