|
|
--- ./Makefile.in.orig 2007-12-22 08:56:09.000000000 +0000
+++ ./Makefile.in 2007-12-22 08:56:12.000000000 +0000
@@ -14,7 +14,7 @@
SUBDIRS=libbridge brctl doc all:- for x in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$x ; done
+ for x in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$x || exit 1; done
clean: for x in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$x clean ; done@@ -31,5 +31,5 @@
rm -f doc/Makefile install:- for x in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$x install; done
+ for x in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$x install || exit 1; done
--- ./brctl/brctl.c.orig 2007-12-22 09:01:44.000000000 +0000
+++ ./brctl/brctl.c 2007-12-22 09:01:54.000000000 +0000
@@ -16,6 +16,11 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +// blkcnt_t kernel include vs. libc include fix
+#define blkcnt_t libc_blkcnt_t
+#include <sys/types.h>
+#undef blkcnt_t
+
#include <stdio.h> #include <stdlib.h> #include <string.h>--- ./brctl/brctl_cmd.c.orig 2007-12-22 09:01:44.000000000 +0000
+++ ./brctl/brctl_cmd.c 2007-12-22 09:01:58.000000000 +0000
@@ -16,6 +16,11 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +// blkcnt_t kernel include vs. libc include fix
+#define blkcnt_t libc_blkcnt_t
+#include <sys/types.h>
+#undef blkcnt_t
+
#include <stdio.h> #include <stdlib.h> #include <string.h>--- ./brctl/brctl_disp.c.orig 2007-12-22 09:01:44.000000000 +0000
+++ ./brctl/brctl_disp.c 2007-12-22 09:02:02.000000000 +0000
@@ -16,6 +16,11 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +// blkcnt_t kernel include vs. libc include fix
+#define blkcnt_t libc_blkcnt_t
+#include <sys/types.h>
+#undef blkcnt_t
+
#include <stdio.h> #include <stdlib.h> #include <string.h>--- ./libbridge/libbridge_devif.c.orig 2007-12-22 08:59:44.000000000 +0000
+++ ./libbridge/libbridge_devif.c 2007-12-22 09:00:45.000000000 +0000
@@ -16,6 +16,10 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +// blkcnt_t kernel include vs. libc include fix
+#define blkcnt_t libc_blkcnt_t
+#include <sys/types.h>
+#undef blkcnt_t
#include <stdio.h> #include <stdlib.h>--- ./libbridge/libbridge_if.c.orig 2007-12-22 08:59:44.000000000 +0000
+++ ./libbridge/libbridge_if.c 2007-12-22 09:00:50.000000000 +0000
@@ -16,6 +16,11 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +// blkcnt_t kernel include vs. libc include fix
+#define blkcnt_t libc_blkcnt_t
+#include <sys/types.h>
+#undef blkcnt_t
+
#include <stdio.h> #include <stdlib.h> #include <errno.h>--- ./libbridge/libbridge_init.c.orig 2007-12-22 08:59:44.000000000 +0000
+++ ./libbridge/libbridge_init.c 2007-12-22 09:00:53.000000000 +0000
@@ -16,6 +16,11 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +// blkcnt_t kernel include vs. libc include fix
+#define blkcnt_t libc_blkcnt_t
+#include <sys/types.h>
+#undef blkcnt_t
+
#include <stdio.h> #include <stdlib.h> #include <unistd.h>--- ./libbridge/libbridge_misc.c.orig 2007-12-22 08:59:44.000000000 +0000
+++ ./libbridge/libbridge_misc.c 2007-12-22 09:00:56.000000000 +0000
@@ -16,6 +16,11 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +// blkcnt_t kernel include vs. libc include fix
+#define blkcnt_t libc_blkcnt_t
+#include <sys/types.h>
+#undef blkcnt_t
+
#include <stdio.h> #include <stdlib.h> #include <string.h>
|
