CVS: sml-dist/src/runtime/include asm-base.h,1.8,1.9 machine-id.h,1.6,1.7 ml-osdep.h,1.5,1.6 ml-unixdep.h,1.8,1.9

Update of /cvsroot/smlnj/sml-dist/src/runtime/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv620/src/runtime/include

Modified Files:
	asm-base.h machine-id.h ml-osdep.h ml-unixdep.h 
Log Message:
  NetBSD patches for version 3.x (provided by Cary Gray)


Index: asm-base.h
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/runtime/include/asm-base.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** asm-base.h	16 May 2003 16:59:29 -0000	1.8
--- asm-base.h	10 Feb 2006 22:14:57 -0000	1.9
***************
*** 17,21 ****
  #define TRUE	1
  
! #if (!defined(GLOBALS_HAVE_UNDERSCORE)) && (defined(OPSYS_SUNOS) || (defined(OPSYS_FREEBSD) && !defined(__ELF__)) || (defined(OPSYS_NETBSD) && !defined(__ELF__)) || defined(OPSYS_NEXTSTEP) || defined(OPSYS_WIN32) || defined(OPSYS_DARWIN) || defined(OPSYS_CYGWIN))
  #  define GLOBALS_HAVE_UNDERSCORE
  #endif
--- 17,21 ----
  #define TRUE	1
  
! #if (!defined(GLOBALS_HAVE_UNDERSCORE)) && (defined(OPSYS_SUNOS) || (defined(OPSYS_FREEBSD) && !defined(__ELF__)) || defined(OPSYS_NETBSD) || (defined(OPSYS_NETBSD2) && !defined(__ELF__)) || defined(OPSYS_NEXTSTEP) || defined(OPSYS_WIN32) || defined(OPSYS_DARWIN) || defined(OPSYS_CYGWIN))
  #  define GLOBALS_HAVE_UNDERSCORE
  #endif

Index: machine-id.h
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/runtime/include/machine-id.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** machine-id.h	16 May 2003 16:59:29 -0000	1.6
--- machine-id.h	10 Feb 2006 22:14:58 -0000	1.7
***************
*** 47,51 ****
  #  elif (defined(OPSYS_DUNIX))
  #    define OPSYS_ID	"dunix"
! #  elif (defined(OPSYS_FREEBSD) || defined(OPSYS_NETBSD))
  #    define OPSYS_ID	"bsd"
  #  elif (defined(OPSYS_HPUX9))
--- 47,51 ----
  #  elif (defined(OPSYS_DUNIX))
  #    define OPSYS_ID	"dunix"
! #  elif (defined(OPSYS_FREEBSD) || defined(OPSYS_NETBSD) || defined(OPSYS_NETBSD2))
  #    define OPSYS_ID	"bsd"
  #  elif (defined(OPSYS_HPUX9))

Index: ml-osdep.h
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/runtime/include/ml-osdep.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ml-osdep.h	6 Feb 2006 22:04:00 -0000	1.5
--- ml-osdep.h	10 Feb 2006 22:14:58 -0000	1.6
***************
*** 18,22 ****
  
  #if defined(OPSYS_UNIX)
! #  if (defined(OPSYS_SUNOS) || defined(OPSYS_IRIX4) || defined(OPSYS_LINUX) || defined(OPSYS_AIX) || defined(OPSYS_FREEBSD) || defined(OPSYS_NETBSD) || defined(OPSYS_DARWIN) || defined(OPSYS_CYGWIN))
  #     define GETPAGESIZE()	(getpagesize())
  #  else
--- 18,22 ----
  
  #if defined(OPSYS_UNIX)
! #  if (defined(OPSYS_SUNOS) || defined(OPSYS_IRIX4) || defined(OPSYS_LINUX) || defined(OPSYS_AIX) || defined(OPSYS_FREEBSD) || defined(OPSYS_NETBSD) || defined(OPSYS_NETBSD2) || defined(OPSYS_DARWIN) || defined(OPSYS_CYGWIN))
  #     define GETPAGESIZE()	(getpagesize())
  #  else

Index: ml-unixdep.h
===================================================================
RCS file: /cvsroot/smlnj/sml-dist/src/runtime/include/ml-unixdep.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ml-unixdep.h	16 May 2003 16:59:29 -0000	1.8
--- ml-unixdep.h	10 Feb 2006 22:14:58 -0000	1.9
***************
*** 96,100 ****
  #endif
  
! #if defined(OPSYS_OSF1) || defined(OPSYS_DUNIX) || defined(OPSYS_AIX) || defined(OPSYS_LINUX) || defined(OPSYS_MKLINUX) || defined(OPSYS_FREEBSD) || defined(OPSYS_NETBSD) || defined(OPSYS_CYGWIN)
  #  define INCLUDE_DIRENT_H	<dirent.h>
  #elif defined(OPSYS_MACH)
--- 96,100 ----
  #endif
  
! #if defined(OPSYS_OSF1) || defined(OPSYS_DUNIX) || defined(OPSYS_AIX) || defined(OPSYS_LINUX) || defined(OPSYS_MKLINUX) || defined(OPSYS_FREEBSD) || defined(OPSYS_NETBSD) || defined(OPSYS_NETBSD2) || defined(OPSYS_CYGWIN)
  #  define INCLUDE_DIRENT_H	<dirent.h>
  #elif defined(OPSYS_MACH)
***************
*** 307,311 ****
  #  define MAP_ANONYMOUS MAP_ANON
  
! #elif defined(OPSYS_NETBSD)
  #  define OS_NAME	"BSD"
  #  define HAS_POSIX_LIBRARIES
--- 307,311 ----
  #  define MAP_ANONYMOUS MAP_ANON
  
! #elif defined(OPSYS_NETBSD2) /* version 2.x */
  #  define OS_NAME	"BSD"
  #  define HAS_POSIX_LIBRARIES
***************
*** 320,323 ****
--- 320,336 ----
  #  define HAS_STRERROR
  
+ #elif defined(OPSYS_NETBSD) /* version 3.x */
+ #  define OS_NAME	"BSD"
+ #  define HAS_POSIX_LIBRARIES
+ #  define HAS_BSD_SIGS
+ #  define HAS_GETRUSAGE
+ #  define HAS_SETITIMER
+ #  define HAS_MMAP
+ #  define HAS_SELECT
+ #  define HAS_SCALBN
+ #  define HAS_ILOGB
+ #  define HAS_UCONTEXT
+ #  define HAS_STRERROR
+ 
  #elif (defined(TARGET_X86) && defined(OPSYS_CYGWIN))
  #  define OS_NAME	"Cygwin" 



-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems?  Stop!  Download the new AJAX search engine that makes
searching your log files as easy as surfing the  web.  DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642