Cleanups that aim towards the 64bit fixes.

diff --git a/sys/solaris/Makefile.kernel b/sys/solaris/Makefile.kernel
index 3a1be8ee5e42ccde17ba6c2e3435d3e520a27dc3..611afd4baecb4e4063453c61d8da7640853eba16 100644 (file)
--- a/sys/solaris/Makefile.kernel
+++ b/sys/solaris/Makefile.kernel
@@ -10,10 +10,11 @@ USE_CRYPTLIB=no
 
 # use gcc (gcc-2.95 on 64-bit sparc)
 CC=            gcc
+LD=            ld
 KCFLAGS=       -D_KERNEL -Wall -Wstrict-prototypes ${KGCCFLAGS} # -mcpu=ultrasparc
 OPTOPTS=       -O
 CSHAREDFLAGS=   -fPIC
-LDSHARED=      gcc
+LDSHARED=      ${CC}
 LDSHAREDFLAGS=  -shared
 
 # use Sun CC (for a 64-bit kernel, uncomment " -xarch=v9 -xregs=no%appl ") 
@@ -43,7 +44,7 @@ OBJ= linkage.o tpi.o dlpi.o ioc.o if.o aarp.o ddp.o sock.o rt.o
 HEADERS= if.h ioc.h rt.h sock.h
 EXTRA_DIST= ddp.conf Makefile
 
-INCPATH=       -I../../include -I../netatalk
+INCPATH=       -I../../include -I../netatalk -I../..
 CFLAGS=        ${DEFS} ${OPTOPTS} ${INCPATH} ${KCFLAGS} 
 
 ALL=   ../../libatalk ../../include ../../bin ../../etc ../../man
@@ -83,7 +84,7 @@ kernel :      FRC
 FRC: 
 
 ddp :  ${OBJ}
-       ld -r -o ddp ${OBJ}
+       ${LD} -r -o ddp ${OBJ}
 
 linkage.o : linkage.c
        ${CC} ${CFLAGS} -DVERSION=\"`cat ../../VERSION`\" -c linkage.c

diff --git a/sys/solaris/aarp.c b/sys/solaris/aarp.c
index 968a7881e7eeb1c3ecb3cb447b8cf90e8355ea70..9383ecfb92766d1891ba8701acd679ed9bcc8ef1 100644 (file)
--- a/sys/solaris/aarp.c
+++ b/sys/solaris/aarp.c
@@ -1,5 +1,5 @@
 /*
- * $Id: aarp.c,v 1.2 2001-06-29 14:14:47 rufustfirefly Exp $
+ * $Id: aarp.c,v 1.3 2002-01-17 06:13:02 srittau Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -18,7 +18,11 @@
 #include <netinet/arp.h>
 #include <net/if.h>
 
+#ifdef STDC_HEADERS
+#include <strings.h>
+#else
 #include <string.h>
+#endif
 
 #include <netatalk/at.h>
 #include <netatalk/aarp.h>

diff --git a/sys/solaris/ddp.c b/sys/solaris/ddp.c
index 97dea86f917f67b5f3ff6220106569d7285860d4..526c5f893e51be1497e72501409fd73fe59cb4cd 100644 (file)
--- a/sys/solaris/ddp.c
+++ b/sys/solaris/ddp.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ddp.c,v 1.2 2001-06-29 14:14:47 rufustfirefly Exp $
+ * $Id: ddp.c,v 1.3 2002-01-17 06:13:02 srittau Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -16,7 +16,11 @@
 #include <sys/ethernet.h>
 #include <net/if.h>
 
+#ifdef STDC_HEADERS
+#include <strings.h>
+#else
 #include <string.h>
+#endif
 
 #include <netatalk/endian.h>
 #include <netatalk/ddp.h>

diff --git a/sys/solaris/dlpi.c b/sys/solaris/dlpi.c
index e70b465ca8d8034f579a1131dbe78cd8db101c9e..2be6de3282ae4781b35c67671a68f33e6228c327 100644 (file)
--- a/sys/solaris/dlpi.c
+++ b/sys/solaris/dlpi.c
@@ -1,3 +1,8 @@
+/* $Id: dlpi.c,v 1.2 2002-01-17 06:13:02 srittau Exp $
+ */
+
+#include <config.h>
+
 #include <sys/types.h>
 #include <sys/kmem.h>
 #include <sys/stream.h>