[Firebird-checkins] CVS: interbase/jrd common.h,1.8,1.9 dyn.e,1.3,1.4 isc_sync.c,1.4,1.5

[John B. <bel...@us...>]

Update of /cvsroot/firebird/interbase/jrd
In directory usw-pr-cvs1:/tmp/cvs-serv20803/jrd

Modified Files:
	common.h dyn.e isc_sync.c 
Log Message:
Changes to the build system to allow Darwin classic to compile given other
platform constraints.  Also included changes to allow Darwin SS to compile.



Index: common.h
===================================================================
RCS file: /cvsroot/firebird/interbase/jrd/common.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -U3 -r1.8 -r1.9
--- common.h	2001/05/24 04:11:11	1.8
+++ common.h	2001/06/05 19:43:58	1.9
@@ -106,6 +106,12 @@
 #define MMAP_SUPPORTED
 #define LSEEK_OFFSET_CAST (off_t)
 #define INTL
+#define SIGACTION_SUPPORTED
+
+#define MEMMOVE(from,to,length)     memmove ((void *)to, (void *)from, (size_t)length) 
+#define MOVE_FAST(from,to,length)       memcpy (to, from, (int) (length))
+#define MOVE_FASTER(from,to,length)     memcpy (to, from, (int) (length))
+#define MOVE_CLEAR(to,length)           memset (to, 0, (int) (length))
 
 #define _PPC_PARAM_H_
 #ifndef MAXPATHLEN

Index: dyn.e
===================================================================
RCS file: /cvsroot/firebird/interbase/jrd/dyn.e,v
retrieving revision 1.3
retrieving revision 1.4
diff -U3 -r1.3 -r1.4
--- dyn.e	2001/05/25 08:16:24	1.3
+++ dyn.e	2001/06/05 19:43:58	1.4
@@ -22,6 +22,9 @@
  *    20-Apr-2001 Claudio Valderrama  - Fix bug in grant/revoke by making user
  *                                      case insensitive.
  *    24-May-2001 Claudio Valderrama - Move DYN_delete_role to dyn_del.e.
+ *    05-Jun-2001 John Bellardo - Renamed the revoke static function to
+ *                                revoke_permission, because there is already
+ *                                a revoke(2) function in *nix.
  *                                      
  */
 
@@ -75,7 +78,7 @@
 static void	grant (GBL, UCHAR **);
 static BOOLEAN  grantor_can_grant_role (TDBB, GBL, TEXT*, TEXT*);
 static BOOLEAN  grantor_can_grant (GBL, TEXT*, TEXT*, TEXT*, TEXT*, BOOLEAN);
-static void	revoke (GBL, UCHAR **);
+static void	revoke_permission (GBL, UCHAR **);
 static void 	store_privilege (GBL, TEXT *, TEXT *,TEXT *, TEXT *, SSHORT, SSHORT, int);
 
 void DYN_ddl (
@@ -395,7 +398,7 @@
 	break;
 
     case gds__dyn_revoke:
-	revoke (gbl, ptr);
+	revoke_permission (gbl, ptr);
 	break;
 
 /***
@@ -1756,13 +1759,13 @@
 return grantable;
 }
 
-static void revoke (
+static void revoke_permission (
     GBL		gbl,
     UCHAR	**ptr)
 {
 /**************************************
  *
- *	r e v o k e
+ *	r e v o k e _ p e r m i s s i o n
  *
  **************************************
  *

Index: isc_sync.c
===================================================================
RCS file: /cvsroot/firebird/interbase/jrd/isc_sync.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -U3 -r1.4 -r1.5
--- isc_sync.c	2001/05/24 04:11:11	1.4
+++ isc_sync.c	2001/06/05 19:43:58	1.5
@@ -345,7 +345,7 @@
 #define SV_INTERRUPT    0
 #endif
 
-#if defined FREEBSD || defined NETBSD
+#if defined FREEBSD || defined NETBSD || defined DARWIN
 #define sigset      signal
 #endif
 
@@ -5198,7 +5198,7 @@
  **************************************/
 int	state;
 
-#if (!defined HP10 && !defined linux)
+#if (!defined HP10 && !defined linux && !defined DARWIN)
 
 pthread_mutexattr_t     mattr;
 
@@ -5218,7 +5218,7 @@
 	 server (until we are to implement local IPC using shared
 	 memory in which case we need interprocess thread sync.
 */
-#ifdef linux
+#if (defined linux || defined DARWIN)
 return pthread_mutex_init (mutex->mtx_mutex, NULL);
 #else
 state = pthread_mutex_init (mutex->mtx_mutex, pthread_mutexattr_default);