From: Alex Ionescu <aionescu@gmail.com>
Date: Sat, 7 Jan 2006 07:33:08 +0000 (+0000)
Subject: - Get oskittcp to compile on msvc.
X-Git-Tag: backups/expat-rbuild@40467~500
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=edd15921f7f1810d83117efbcd6358011d2fef13;hp=31334bb80f832e4627ff81005f0a8fb83707a2c6

- Get oskittcp to compile on msvc.

svn path=/trunk/; revision=20655
---

diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/machine/spl.h b/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/machine/spl.h
index e5e00d296c1..bb59490279e 100644
--- a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/machine/spl.h
+++ b/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/machine/spl.h
@@ -177,7 +177,7 @@ extern	unsigned tty_imask;	/* group of interrupts masked with spltty() */
 static int splhigh() { return 0; }
 static int splimp() { return 0; }
 static int splnet() { return 0; }
-static int splx() { return 0; }
+static int splx(x) { return 0; }
 static int splclock() { return 0; }
 
 #elif defined(__GNUC__)
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/libkern.h b/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/libkern.h
index b1e66e273ff..c5437567fa5 100644
--- a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/libkern.h
+++ b/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/libkern.h
@@ -62,9 +62,4 @@ u_long	 random __P((void));
 char	*rindex __P((const char *, int));
 int	 scanc __P((u_int, u_char *, u_char *, int));
 int	 skpc __P((int, int, char *));
-char	*strcat __P((char *, const char *));
-int	 strcmp __P((const char *, const char *));
-char	*strcpy __P((char *, const char *));
-size_t	 strlen __P((const char *));
-int	 strncmp __P((const char *, const char *, size_t));
-char	*strncpy __P((char *, const char *, size_t));
+
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/systm.h b/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/systm.h
index 7759be04eda..1e6a8172b36 100644
--- a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/systm.h
+++ b/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/systm.h
@@ -114,7 +114,7 @@ int	ureadc __P((int, struct uio *));
 void	*hashinit __P((int count, int type, u_long *hashmask));
 void	*phashinit __P((int count, int type, u_long *nentries));
 
-__dead void	panic __P((const char *, ...)) __dead2;
+//__dead void	panic __P((const char *, ...)) __dead2;
 __dead void	boot __P((int)) __dead2;
 void	tablefull __P((const char *));
 void	addlog __P((const char *, ...));
@@ -126,7 +126,7 @@ void	printf __P((const char *, ...));
 #include <oskitdebug.h>
 
 
-int __cdecl vprintf(const char *, va_list);
+//int __cdecl vprintf(const char *, va_list);
 
 #define log bsd_log
 static __inline int bsd_log ( int blah, const char* fmt, ... )
diff --git a/reactos/drivers/lib/oskittcp/include/oskitfreebsd.h b/reactos/drivers/lib/oskittcp/include/oskitfreebsd.h
index 53345afb30f..9286fc946b2 100644
--- a/reactos/drivers/lib/oskittcp/include/oskitfreebsd.h
+++ b/reactos/drivers/lib/oskittcp/include/oskitfreebsd.h
@@ -12,7 +12,6 @@ extern void oskittcp_die(const char *file, int line);
 #define printf DbgPrint
 #define vprintf DbgVPrint 
 #define ovbcopy(x,y,z) bcopy(x,y,z)
-void *memset( void *dest, int c, size_t count );
 #define bzero(x,y) memset(x,0,y)
 #define bcopy(src,dst,n) memcpy(dst,src,n)
 #ifdef _MSC_VER
diff --git a/reactos/drivers/lib/oskittcp/oskittcp/interface.c b/reactos/drivers/lib/oskittcp/oskittcp/interface.c
index 14f4c85f05c..fb44beb5100 100644
--- a/reactos/drivers/lib/oskittcp/oskittcp/interface.c
+++ b/reactos/drivers/lib/oskittcp/oskittcp/interface.c
@@ -30,7 +30,6 @@ unsigned volatile ipending;
 struct timeval boottime;
 
 void clock_init();
-int isprint(int c);
 int _snprintf(char * buf, size_t cnt, const char *fmt, ...);
 
 void *fbsd_malloc( unsigned int bytes, char *file, unsigned line, ... ) {