CVS update: php3/functions
| From: | sas | Date: | Sat, 19 Dec 1998 11:26:26 +0000 |
| Subject: | CVS update: php3/functions | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-2864@lists.php.net to get a copy of this message | ||
Date: Saturday December 19, 1998 @ 6:26
Author: sas
Update of /repository/php3/functions
In directory asf:/u/temp/cvs-serv19945
Modified Files:
sysvsem.c
Log Message:
Fix compile time problems on Linux 2.0.x
Tested with libc5 and glibc 2.0.7p6
Index: php3/functions/sysvsem.c
diff -c php3/functions/sysvsem.c:1.2 php3/functions/sysvsem.c:1.3
*** php3/functions/sysvsem.c:1.2 Thu Nov 19 10:46:51 1998
--- php3/functions/sysvsem.c Sat Dec 19 06:26:25 1998
***************
*** 27,33 ****
+----------------------------------------------------------------------+
*/
! /* $Id: sysvsem.c,v 1.2 1998/11/19 15:46:51 tommay Exp $ */
/* This has been built and tested on Solaris 2.6 and Linux 2.1.122.
* It may not compile or execute correctly on other systems.
--- 27,33 ----
+----------------------------------------------------------------------+
*/
! /* $Id: sysvsem.c,v 1.3 1998/12/19 11:26:25 sas Exp $ */
/* This has been built and tested on Solaris 2.6 and Linux 2.1.122.
* It may not compile or execute correctly on other systems.
***************
*** 133,138 ****
--- 133,141 ----
struct sembuf sop[3];
int count;
sysvsem_sem *sem_ptr;
+ #if HAVE_SEMUN
+ union semun un;
+ #endif
max_acquire = 1;
perm = 0666;
***************
*** 216,223 ****
}
/* Get the usage count. */
!
count = semctl(semid, SYSVSEM_USAGE, GETVAL, NULL);
if (count == -1) {
php3_error(E_WARNING, "semctl(GETVAL) failed for key 0x%x: %s", key, strerror(errno));
}
--- 219,229 ----
}
/* Get the usage count. */
! #if HAVE_SEMUN
! count = semctl(semid, SYSVSEM_USAGE, GETVAL, un);
! #else
count = semctl(semid, SYSVSEM_USAGE, GETVAL, NULL);
+ #endif
if (count == -1) {
php3_error(E_WARNING, "semctl(GETVAL) failed for key 0x%x: %s", key, strerror(errno));
}
--
PHP Development Mailing List http://www.php.net/
To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net
For help: php-dev-help@lists.php.net