[Firebird-checkins] CVS: interbase/lock fparamv3.h,1.2,1.3 lock.c,1.4,1.5 lockv3.h,1.2,1.3

[Ty S. <ts...@us...>]

Update of /cvsroot/firebird/interbase/lock
In directory slayer.i.sourceforge.net:/tmp/cvs-serv18269/lock

Modified Files:
	fparamv3.h lock.c lockv3.h 
Log Message:
NetBSD support. Thanks to Geoffrey C. Speicher for the FreeBSD port,
which made this much easier.


Index: fparamv3.h
===================================================================
RCS file: /cvsroot/firebird/interbase/lock/fparamv3.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** fparamv3.h	2000/08/16 23:30:38	1.2
--- fparamv3.h	2000/10/12 02:52:17	1.3
***************
*** 79,83 ****
  #endif
  
! #if (defined linux || defined FREEBSD)
  #include <sys/types.h>
  #include <sys/ipc.h>
--- 79,83 ----
  #endif
  
! #if (defined linux || defined FREEBSD || defined NETBSD)
  #include <sys/types.h>
  #include <sys/ipc.h>

Index: lock.c
===================================================================
RCS file: /cvsroot/firebird/interbase/lock/lock.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** lock.c	2000/09/07 18:24:10	1.4
--- lock.c	2000/10/12 02:52:17	1.5
***************
*** 191,195 ****
  #define DUMMY_OWNER_SHUTDOWN	((PTR) -3)
  
! #if !(defined linux || defined NETWARE_386 || defined WIN_NT || defined OS2_ONLY || defined mpexl || defined FREEBSD)
  extern SCHAR	*sys_errlist[];
  #endif
--- 191,195 ----
  #define DUMMY_OWNER_SHUTDOWN	((PTR) -3)
  
! #if !(defined linux || defined NETWARE_386 || defined WIN_NT || defined OS2_ONLY || defined mpexl || defined FREEBSD || defined NETBSD)
  extern SCHAR	*sys_errlist[];
  #endif
***************
*** 873,877 ****
  
  #ifndef  SUPERSERVER
! #if defined(SCO_EV) || defined(LINUX) || defined(FREEBSD) || defined(AIX_PPC)
  /* 5.5 SCO port: might also help other classic ports, but not sure. This
     and a few subsequent pieces of code later, solve problem of gds_drop 
--- 873,877 ----
  
  #ifndef  SUPERSERVER
! #if defined(SCO_EV) || defined(LINUX) || defined(FREEBSD) || defined(NETBSD) || defined(AIX_PPC)
  /* 5.5 SCO port: might also help other classic ports, but not sure. This
     and a few subsequent pieces of code later, solve problem of gds_drop 
***************
*** 889,893 ****
  
  #if !(defined NETWARE_386 || defined WIN_NT || defined OS2_ONLY || defined SOLARIS_MT || POSIX_THREADS)
! #if defined(SCO_EV) || defined(LINUX) || defined(FREEBSD) || defined(AIX_PPC)
  if (LOCK_owner_offset )   /* 5.5 SCO port: gds_drop */
  #endif
--- 889,893 ----
  
  #if !(defined NETWARE_386 || defined WIN_NT || defined OS2_ONLY || defined SOLARIS_MT || POSIX_THREADS)
! #if defined(SCO_EV) || defined(LINUX) || defined(FREEBSD) || defined(NETBSD) || defined(AIX_PPC)
  if (LOCK_owner_offset )   /* 5.5 SCO port: gds_drop */
  #endif
***************
*** 989,993 ****
      }
  #else
! #if defined(SCO_EV) || defined(LINUX) || defined(FREEBSD) || defined(AIX_PPC)
  if ( LOCK_owner_offset ) /* 5.5 SCO Port: gds_drop */
  #endif
--- 989,993 ----
      }
  #else
! #if defined(SCO_EV) || defined(LINUX) || defined(FREEBSD) || defined(NETBSD) || defined(AIX_PPC)
  if ( LOCK_owner_offset ) /* 5.5 SCO Port: gds_drop */
  #endif

Index: lockv3.h
===================================================================
RCS file: /cvsroot/firebird/interbase/lock/lockv3.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** lockv3.h	2000/08/16 23:30:39	1.2
--- lockv3.h	2000/10/12 02:52:18	1.3
***************
*** 40,44 ****
  #include "../lock/fparamv3.h"
  
! #if (defined linux || defined FREEBSD)
  #define SEMUN
  #endif
--- 40,44 ----
  #include "../lock/fparamv3.h"
  
! #if (defined linux || defined FREEBSD || defined NETBSD)
  #define SEMUN
  #endif