summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2002-05-13 15:34:06 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2002-05-13 15:34:06 +0000
commitbbf18a0abc3555df8b735a6620487ce964170cdb (patch)
tree13da7dc3398bde91f158749699bffbb2d561a687
parent1db80ad887a80f62da0014b1fe37542032042939 (diff)
downloaddrakx-bbf18a0abc3555df8b735a6620487ce964170cdb.tar
drakx-bbf18a0abc3555df8b735a6620487ce964170cdb.tar.gz
drakx-bbf18a0abc3555df8b735a6620487ce964170cdb.tar.bz2
drakx-bbf18a0abc3555df8b735a6620487ce964170cdb.tar.xz
drakx-bbf18a0abc3555df8b735a6620487ce964170cdb.zip
adapt to gcc-3.1
-rw-r--r--mdk-stage1/Makefile2
-rw-r--r--mdk-stage1/ppp/pppd/ipcp.c2
-rw-r--r--mdk-stage1/probing.c6
3 files changed, 5 insertions, 5 deletions
diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile
index 2da2e1d78..98fb79375 100644
--- a/mdk-stage1/Makefile
+++ b/mdk-stage1/Makefile
@@ -51,7 +51,7 @@ COMPILE = $(CC) $(DEFS) $(CFLAGS)
#- stage1 "loader"
ifeq (i386, $(ARCH))
INITSRC = minilibc.c init.c
-INIT_DEFS = -DINIT_HEADERS=\"minilibc.h\"
+INIT_DEFS = -DINIT_HEADERS=\"minilibc.h\" -fno-builtin
else
INITSRC = init.c
ifeq (ia64, $(ARCH))
diff --git a/mdk-stage1/ppp/pppd/ipcp.c b/mdk-stage1/ppp/pppd/ipcp.c
index ac5bd39fa..3f64357ed 100644
--- a/mdk-stage1/ppp/pppd/ipcp.c
+++ b/mdk-stage1/ppp/pppd/ipcp.c
@@ -2012,7 +2012,7 @@ ipcp_printpkt(p, plen, printer, arg)
*/
#define IP_HDRLEN 20 /* bytes */
#define IP_OFFMASK 0x1fff
-#define IPPROTO_TCP 6
+// #define IPPROTO_TCP 6
#define TCP_HDRLEN 20
#define TH_FIN 0x01
diff --git a/mdk-stage1/probing.c b/mdk-stage1/probing.c
index fafb3be93..6dd678ce0 100644
--- a/mdk-stage1/probing.c
+++ b/mdk-stage1/probing.c
@@ -210,7 +210,7 @@ static void probe_that_type(enum driver_type type)
}
}
fclose(f);
- end_pci_probe:
+ end_pci_probe:;
}
@@ -284,7 +284,7 @@ static void probe_that_type(enum driver_type type)
}
}
fclose(f);
- end_usb_probe:
+ end_usb_probe:;
}
#endif
}
@@ -498,7 +498,7 @@ static void find_media(void)
start = next;
}
- end_scsi:
+ end_scsi:;
}
/* ----------------------------------------------- */