Update of /cvsroot/firebird/interbase/utilities
In directory usw-pr-cvs1:/tmp/cvs-serv27499
Modified Files:
drop.c dropv3.c
Log Message:
Fixed linux platform error introduced by the original darwin port.
Index: drop.c
===================================================================
RCS file: /cvsroot/firebird/interbase/utilities/drop.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -U3 -r1.5 -r1.6
--- drop.c 2001/05/24 04:11:12 1.5
+++ drop.c 2001/05/25 17:21:32 1.6
@@ -299,7 +299,9 @@
SLONG length, key, semid;
TEXT expanded_filename [MAXPATHLEN];
int pid;
+#ifdef DARWIN
union semun semctlArg;
+#endif
#ifdef MANAGER_PROCESS
/* Shutdown lock manager process so that shared memory
@@ -334,8 +336,12 @@
return;
}
+#ifdef DARWIN
semctlArg.val = 0;
if (semctl (semid, sem_count, IPC_RMID, semctlArg) == -1)
+#else
+if (semctl (semid, sem_count, IPC_RMID, 0) == -1)
+#endif
ib_printf ("\n***Error trying to drop %s semaphores. ERRNO = %d.\n", label, errno);
else
ib_printf ("Successfully removed %s semaphores.\n", label);
Index: dropv3.c
===================================================================
RCS file: /cvsroot/firebird/interbase/utilities/dropv3.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -U3 -r1.2 -r1.3
--- dropv3.c 2001/05/24 04:11:12 1.2
+++ dropv3.c 2001/05/25 17:21:32 1.3
@@ -304,7 +304,9 @@
long length, key, shmid, semid;
TEXT expanded_filename [512], hostname [64];
struct stat stat_buf;
+#ifdef DARWIN
union semun semctlArg;
+#endif
#ifdef NOHOSTNAME
strcpy (expanded_filename, filename);
@@ -334,8 +336,12 @@
return;
}
+#ifdef DARWIN
semctlArg.val = 0;
if (semctl (semid, sem_count, IPC_RMID, semctlArg) == -1)
+#else
+if (semctl (semid, sem_count, IPC_RMID, 0) == -1)
+#endif
ib_printf ("\n***Error trying to drop bridge %s semaphores. ERRNO = %d.\n", label, errno);
else
ib_printf ("Successfully removed bridge %s semaphores.\n", label);
|
