From: Kees van Reeuwijk <reeuwijk@few.vu.nl>
Date: Fri, 12 Feb 2010 14:43:18 +0000 (+0000)
Subject: Undo the use of #include <...> because it caused some errors.
X-Git-Tag: v3.1.7~290
X-Git-Url: http://zhaoyanbai.com/repos/dnssec-keygen.html?a=commitdiff_plain;h=df60646f985b58cff90d0015bdc5e5f4e23c4c65;p=minix.git

Undo the use of #include <...> because it caused some errors.
---

diff --git a/drivers/at_wini/Makefile b/drivers/at_wini/Makefile
index fdc7afcff..333a9459e 100644
--- a/drivers/at_wini/Makefile
+++ b/drivers/at_wini/Makefile
@@ -13,7 +13,7 @@ p = ../libpci
 # programs, flags, etc.
 MAKE = exec make
 CC =	exec cc
-CFLAGS = -I$i -I.. $(CPROFILE)
+CFLAGS = -I$i $(CPROFILE)
 LDFLAGS = -i -L../libdriver
 LIBS = -ldriver -lsys -ltimers 
 
diff --git a/drivers/at_wini/at_wini.h b/drivers/at_wini/at_wini.h
index df0aa771d..4f7fbd8ea 100644
--- a/drivers/at_wini/at_wini.h
+++ b/drivers/at_wini/at_wini.h
@@ -1,6 +1,6 @@
-#include <drivers.h>
-#include <libdriver/driver.h>
-#include <libdriver/drvlib.h>
+#include "../drivers.h"
+#include "../libdriver/driver.h"
+#include "../libdriver/drvlib.h"
 
 #define VERBOSE		   0	/* display identify messages during boot */
 #define ENABLE_ATAPI	   1	/* add ATAPI cd-rom support to driver */
diff --git a/drivers/bios_wini/Makefile b/drivers/bios_wini/Makefile
index f6a154404..f0ff487e8 100644
--- a/drivers/bios_wini/Makefile
+++ b/drivers/bios_wini/Makefile
@@ -12,7 +12,7 @@ d = ..
 # programs, flags, etc.
 MAKE = exec make
 CC =	exec cc
-CFLAGS = -I$i -I.. $(CPROFILE)
+CFLAGS = -I$i $(CPROFILE)
 LDFLAGS = -i -L../libdriver 
 LIBS = -ldriver    -lsys  -lsys -ltimers 
 
diff --git a/drivers/bios_wini/bios_wini.c b/drivers/bios_wini/bios_wini.c
index b142ce261..e4ffddb4f 100644
--- a/drivers/bios_wini/bios_wini.c
+++ b/drivers/bios_wini/bios_wini.c
@@ -20,9 +20,9 @@
  *	14 May 2000 by Kees J. Bot: d-d/i rewrite.
  */
 
-#include <drivers.h>
-#include <libdriver/driver.h>
-#include <libdriver/drvlib.h>
+#include "../drivers.h"
+#include "../libdriver/driver.h"
+#include "../libdriver/drvlib.h"
 #include <minix/sysutil.h>
 #include <minix/safecopies.h>
 #include <sys/ioc_disk.h>
diff --git a/drivers/floppy/Makefile b/drivers/floppy/Makefile
index d32359c5f..e690291fd 100644
--- a/drivers/floppy/Makefile
+++ b/drivers/floppy/Makefile
@@ -12,7 +12,7 @@ d = ..
 # programs, flags, etc.
 MAKE = exec make
 CC =	exec cc
-CFLAGS = -I.. -I$i $(CPROFILE)
+CFLAGS = -I$i $(CPROFILE)
 LDFLAGS = -i -L../libdriver
 LIBS = -ldriver -lsys  -ltimers
 
diff --git a/drivers/floppy/floppy.c b/drivers/floppy/floppy.c
index 9d313984f..26f86b124 100644
--- a/drivers/floppy/floppy.c
+++ b/drivers/floppy/floppy.c
@@ -300,7 +300,7 @@ PUBLIC int last_transfer_opcode;
 /*===========================================================================*
  *				floppy_task				     *
  *===========================================================================*/
-PUBLIC int main()
+PUBLIC int main(void)
 {
   /* SEF local startup. */
   sef_local_startup();
diff --git a/drivers/floppy/floppy.h b/drivers/floppy/floppy.h
index 415a42519..2bc0334b7 100644
--- a/drivers/floppy/floppy.h
+++ b/drivers/floppy/floppy.h
@@ -1,4 +1,4 @@
-#include <drivers.h>
-#include <libdriver/driver.h>
-#include <libdriver/drvlib.h>
+#include "../drivers.h"
+#include "../libdriver/driver.h"
+#include "../libdriver/drvlib.h"
 
diff --git a/drivers/log/Makefile b/drivers/log/Makefile
index 2834aaf74..eecdc5e69 100644
--- a/drivers/log/Makefile
+++ b/drivers/log/Makefile
@@ -11,7 +11,7 @@ d = ..
 # programs, flags, etc.
 MAKE = exec make
 CC =	exec cc
-CFLAGS = -I.. -I$i $(CPROFILE)
+CFLAGS = -I$i $(CPROFILE)
 LDFLAGS = -i -L../libdriver
 LIBS = -ldriver  -lsys 
 LIB_DEP = ../libdriver/libdriver.a
diff --git a/drivers/log/log.h b/drivers/log/log.h
index 3d8c4c362..d18030507 100644
--- a/drivers/log/log.h
+++ b/drivers/log/log.h
@@ -1,6 +1,6 @@
 /* Includes. */
-#include <drivers.h>
-#include <libdriver/driver.h>
+#include "../drivers.h"
+#include "../libdriver/driver.h"
 #include <minix/type.h>
 #include <minix/const.h>
 #include <minix/com.h>
diff --git a/drivers/orinoco/Makefile b/drivers/orinoco/Makefile
index f9bce9eb0..9a1d8900b 100644
--- a/drivers/orinoco/Makefile
+++ b/drivers/orinoco/Makefile
@@ -11,7 +11,7 @@ d = ..
 
 # programs, flags, etc.
 CC =	exec cc
-CFLAGS = -I.. -I$i $(CPROFILE)
+CFLAGS = -I$i $(CPROFILE)
 LDFLAGS = -i
 LIBS = -lsys -ltimers
 
diff --git a/drivers/orinoco/hermes.h b/drivers/orinoco/hermes.h
index 7c0b0be34..9f43dd833 100644
--- a/drivers/orinoco/hermes.h
+++ b/drivers/orinoco/hermes.h
@@ -19,7 +19,7 @@
 #ifndef _HERMES_H
 #define _HERMES_H
 
-#include <drivers.h>
+#include "../drivers.h"
 #include <net/gen/ether.h>
 #include <net/gen/eth_io.h>
 #include <net/hton.h>
diff --git a/drivers/rtl8139/Makefile b/drivers/rtl8139/Makefile
index 86a45aada..49d2df802 100644
--- a/drivers/rtl8139/Makefile
+++ b/drivers/rtl8139/Makefile
@@ -12,7 +12,7 @@ d = ..
 # programs, flags, etc.
 MAKE = exec make
 CC =	exec cc
-CFLAGS = -I.. -I../.. -I$i $(CPROFILE)
+CFLAGS = -I$i $(CPROFILE)
 LDFLAGS = -i
 LIBS = -lsys -ltimers 
 
diff --git a/drivers/rtl8139/rtl8139.h b/drivers/rtl8139/rtl8139.h
index 0adb74e53..218be4b5c 100644
--- a/drivers/rtl8139/rtl8139.h
+++ b/drivers/rtl8139/rtl8139.h
@@ -4,7 +4,7 @@ ibm/rtl8139.h
 Created:	Aug 2003 by Philip Homburg <philip@cs.vu.nl>
 */
 
-#include <drivers.h>
+#include "../drivers.h"
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -28,9 +28,9 @@ Created:	Aug 2003 by Philip Homburg <philip@cs.vu.nl>
 #include <assert.h>
 #include <unistd.h>
 #include <sys/ioc_memory.h>
-#include <kernel/const.h>
-#include <kernel/config.h>
-#include <kernel/type.h>
+#include "../../kernel/const.h"
+#include "../../kernel/config.h"
+#include "../../kernel/type.h"
 
 #define	RL_IDR		0x00	/* Ethernet address
 				 * Note: RL_9346CR_EEM_CONFIG mode is
diff --git a/drivers/rtl8169/Makefile b/drivers/rtl8169/Makefile
index 09410ad51..0d9403a60 100644
--- a/drivers/rtl8169/Makefile
+++ b/drivers/rtl8169/Makefile
@@ -12,7 +12,7 @@ d = ..
 # programs, flags, etc.
 MAKE = exec make
 CC =	exec cc
-CFLAGS = -I.. -I../.. -I$i $(CPROFILE)
+CFLAGS = -I$i $(CPROFILE)
 LDFLAGS = -i
 LIBS = -lsys -ltimers
 
diff --git a/drivers/rtl8169/rtl8169.c b/drivers/rtl8169/rtl8169.c
index a08661e82..84792b177 100644
--- a/drivers/rtl8169/rtl8169.c
+++ b/drivers/rtl8169/rtl8169.c
@@ -6,7 +6,7 @@
  *
  */
 
-#include <drivers.h>
+#include "../drivers.h"
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -26,9 +26,9 @@
 #include <sys/types.h>
 #include <assert.h>
 #include <unistd.h>
-#include <kernel/const.h>
-#include <kernel/config.h>
-#include <kernel/type.h>
+#include "../../kernel/const.h"
+#include "../../kernel/config.h"
+#include "../../kernel/type.h"
 
 #define debug			1
 #define printW()		((void)0)
diff --git a/drivers/ti1225/Makefile b/drivers/ti1225/Makefile
index d26cdf55e..b197db5dd 100644
--- a/drivers/ti1225/Makefile
+++ b/drivers/ti1225/Makefile
@@ -11,7 +11,7 @@ d = ..
 
 # programs, flags, etc.
 CC =	exec cc
-CFLAGS = -I.. -I$i $(CPROFILE)
+CFLAGS = -I$i $(CPROFILE)
 LDFLAGS = -i 
 LIBS = -lsys -ltimers
 
diff --git a/drivers/ti1225/ti1225.c b/drivers/ti1225/ti1225.c
index 1254dc29a..bff640de2 100644
--- a/drivers/ti1225/ti1225.c
+++ b/drivers/ti1225/ti1225.c
@@ -4,7 +4,7 @@ ti1225.c
 Created:	Dec 2005 by Philip Homburg
 */
 
-#include <drivers.h>
+#include "../drivers.h"
 #include <ibm/pci.h>
 #include <sys/vm_i386.h>
 
diff --git a/drivers/tty/tty.c b/drivers/tty/tty.c
index dc403adb8..9f737eb1b 100644
--- a/drivers/tty/tty.c
+++ b/drivers/tty/tty.c
@@ -71,8 +71,6 @@
 #include <sys/time.h>
 #include <sys/select.h>
 
-extern int irq_hook_id;
-
 unsigned long kbd_irq_set = 0;
 unsigned long rs_irq_set = 0;
 
diff --git a/drivers/tty/tty.h b/drivers/tty/tty.h
index 79cfed7d4..82da3a700 100644
--- a/drivers/tty/tty.h
+++ b/drivers/tty/tty.h
@@ -106,7 +106,6 @@ typedef struct tty {
 /* Memory allocated in tty.c, so extern here. */
 extern tty_t tty_table[NR_CONS+NR_RS_LINES+NR_PTYS];
 extern int ccurrent;		/* currently visible console */
-extern int irq_hook_id;		/* hook id for keyboard irq */
 extern u32_t system_hz;		/* system clock frequency */
 
 extern unsigned long kbd_irq_set;
diff --git a/kernel/arch/i386/memory.c b/kernel/arch/i386/memory.c
index 159ba42e6..27b211e44 100644
--- a/kernel/arch/i386/memory.c
+++ b/kernel/arch/i386/memory.c
@@ -43,7 +43,6 @@ PRIVATE int nfreepdes = 0, freepdes[WANT_FREEPDES], inusepde = NOPDE;
 
 FORWARD _PROTOTYPE( u32_t phys_get32, (phys_bytes v)			);
 FORWARD _PROTOTYPE( void vm_enable_paging, (void)			);
-FORWARD _PROTOTYPE( void set_cr3, (void)			);
 
 	
 /* *** Internal VM Functions *** */