* restore fix for include order; error reported by espie@

* regen patches with update-patches
This commit is contained in:
naddy 2002-02-06 02:05:08 +00:00
parent cd7967f0b6
commit d23be30baf
3 changed files with 23 additions and 14 deletions

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_cpu_m68000_make68k_c,v 1.2 2002/02/05 15:27:17 naddy Exp $ $OpenBSD: patch-src_cpu_m68000_make68k_c,v 1.3 2002/02/06 02:05:08 naddy Exp $
--- src/cpu/m68000/make68k.c.orig Wed Jan 16 02:22:32 2002 --- src/cpu/m68000/make68k.c.orig Tue Jan 1 20:16:32 2002
+++ src/cpu/m68000/make68k.c Wed Jan 16 02:25:44 2002 +++ src/cpu/m68000/make68k.c Wed Feb 6 02:18:17 2002
@@ -7637,11 +7637,11 @@ @@ -7637,11 +7637,11 @@ void CodeSegmentBegin(void)
fprintf(fp, "\t\t EXTERN _OP_RAM\n"); fprintf(fp, "\t\t EXTERN _OP_RAM\n");
fprintf(fp, "\t\t EXTERN _opcode_entry\n"); fprintf(fp, "\t\t EXTERN _opcode_entry\n");

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_unix_joystick-drivers_joy_usb_c,v 1.3 2002/02/05 15:27:17 naddy Exp $ $OpenBSD: patch-src_unix_joystick-drivers_joy_usb_c,v 1.4 2002/02/06 02:05:08 naddy Exp $
--- src/unix/joystick-drivers/joy_usb.c.orig Wed Jan 16 00:28:53 2002 --- src/unix/joystick-drivers/joy_usb.c.orig Sat Nov 3 02:22:56 2001
+++ src/unix/joystick-drivers/joy_usb.c Wed Jan 16 00:33:20 2002 +++ src/unix/joystick-drivers/joy_usb.c Wed Feb 6 02:18:17 2002
@@ -15,13 +15,13 @@ @@ -15,13 +15,13 @@ struct rc_option joy_usb_opts[] = {
#ifdef USB_JOYSTICK #ifdef USB_JOYSTICK

View File

@ -1,7 +1,16 @@
$OpenBSD: patch-src_unix_unix_mak,v 1.5 2002/02/05 15:27:17 naddy Exp $ $OpenBSD: patch-src_unix_unix_mak,v 1.6 2002/02/06 02:05:08 naddy Exp $
--- src/unix/unix.mak.orig Wed Jan 16 00:12:17 2002 --- src/unix/unix.mak.orig Mon Dec 31 09:19:03 2001
+++ src/unix/unix.mak Wed Jan 16 00:16:57 2002 +++ src/unix/unix.mak Wed Feb 6 02:18:56 2002
@@ -174,7 +174,7 @@ @@ -153,7 +153,7 @@ MY_CFLAGS = $(CFLAGS) $(IL) $(CFLAGS.$(M
-Dstricmp=strcasecmp -Dstrnicmp=strncasecmp \
-DPI=M_PI -DUNIX -DSIGNED_SAMPLES \
$(COREDEFS) $(SOUNDDEFS) $(CPUDEFS) $(ASMDEFS) \
- $(INCLUDES) $(INCLUDE_PATH)
+ $(INCLUDE_PATH) $(INCLUDES)
MY_LIBS = $(LIBS) $(LIBS.$(ARCH)) $(LIBS.$(DISPLAY_METHOD)) -lz
@@ -174,7 +174,7 @@ endif
# CONFIG are the cflags used to build the unix tree, this is were most defines # CONFIG are the cflags used to build the unix tree, this is were most defines
# go # go
CONFIG = $(MY_CFLAGS) $(CFLAGS.$(DISPLAY_METHOD)) -DNAME='\"x$(TARGET)\"' \ CONFIG = $(MY_CFLAGS) $(CFLAGS.$(DISPLAY_METHOD)) -DNAME='\"x$(TARGET)\"' \
@ -10,7 +19,7 @@ $OpenBSD: patch-src_unix_unix_mak,v 1.5 2002/02/05 15:27:17 naddy Exp $
ifdef HAVE_GETTIMEOFDAY ifdef HAVE_GETTIMEOFDAY
CONFIG += -DHAVE_GETTIMEOFDAY CONFIG += -DHAVE_GETTIMEOFDAY
@@ -210,7 +210,7 @@ @@ -210,7 +210,7 @@ CONFIG += -DLIN_FM_TOWNS
endif endif
ifdef JOY_USB ifdef JOY_USB
CONFIG += -DUSB_JOYSTICK CONFIG += -DUSB_JOYSTICK
@ -19,7 +28,7 @@ $OpenBSD: patch-src_unix_unix_mak,v 1.5 2002/02/05 15:27:17 naddy Exp $
endif endif
ifdef EFENCE ifdef EFENCE
@@ -363,12 +363,12 @@ @@ -363,12 +363,12 @@ install-man:
doinstall: doinstall:
@echo installing binaries under $(BINDIR)... @echo installing binaries under $(BINDIR)...
-$(INSTALL_PROGRAM_DIR) $(BINDIR) -$(INSTALL_PROGRAM_DIR) $(BINDIR)