diff options
| author | jakub <jakub> | 2000-01-10 13:55:25 +0000 |
|---|---|---|
| committer | jakub <jakub> | 2000-01-10 13:55:25 +0000 |
| commit | d55ba2575d2066451b02df4cc0eee25221b3f1f7 (patch) | |
| tree | 384dd48352b10972bbf43e87a0bfb5edbec8f543 | |
| parent | 791a0051d2783489d5a8281a752c8458419f861b (diff) | |
| download | anaconda-d55ba2575d2066451b02df4cc0eee25221b3f1f7.tar.gz anaconda-d55ba2575d2066451b02df4cc0eee25221b3f1f7.tar.xz anaconda-d55ba2575d2066451b02df4cc0eee25221b3f1f7.zip | |
linux/loop.h expects to be given correct dev_t.
Remove trailing spaces from Makefile, so sparc ifs work.
| -rw-r--r-- | isys/Makefile | 6 | ||||
| -rw-r--r-- | isys/isys.c | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/isys/Makefile b/isys/Makefile index b26e3982b..cd23d2a53 100644 --- a/isys/Makefile +++ b/isys/Makefile @@ -1,8 +1,8 @@ include ../Makefile.inc ARCH := $(patsubst i%86,i386,$(shell uname -m)) -ARCH := $(patsubst sparc%,sparc,$(ARCH)) -CFLAGS = -I/usr/include/python1.5 -I.. -g +ARCH := $(patsubst sparc%,sparc,$(ARCH)) +CFLAGS = -I/usr/include/python1.5 -I.. -g OBJECTS = nfsmount.o dns.o mount_clnt.o mount_xdr.o imount.o \ smp.o moduleinfo.o devnodes.o cpio.o probe.o uncpio.o STATICOBJS = otherinsmod.o @@ -16,7 +16,7 @@ ifeq ($(ARCH),sparc) PYMODULES += _silo.so endif -all: subdirs $(PYMODULES) libisys.a +all: subdirs $(PYMODULES) libisys.a _isys.so: isys.o $(OBJECTS) $(STATICLIBS) gcc -shared -g -o $@ isys.o $(OBJECTS) $(STATICLIBS) $(LOADLIBES) diff --git a/isys/isys.c b/isys/isys.c index 3847a1fad..6a9a67b89 100644 --- a/isys/isys.c +++ b/isys/isys.c @@ -1,7 +1,14 @@ #include <errno.h> #include <fcntl.h> #include <popt.h> +/* Need to tell loop.h what the actual dev_t type is. */ +#if defined(__alpha) || (defined(__sparc__) && defined(__arch64__)) +#define dev_t unsigned int +#else +#define dev_t unsigned short +#endif #include <linux/loop.h> +#undef dev_t #include <sys/ioctl.h> #include <sys/mount.h> #include <sys/stat.h> |