You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by gs...@locus.apache.org on 2000/12/06 20:53:43 UTC
cvs commit: apr/include/arch/unix locks.h
gstein 00/12/06 11:53:43
Modified: include/arch/unix locks.h
Log:
*) remove include of sys/ipc.h and uslocks.h. the HAVE_ symbols were never
declared anywhere, so these couldn't have been getting included anyway.
*) reorg headers into two groups: those with corresponding APR_HAVE_
symbols, and those without.
*) use the appropriate #if or #ifdef depending upon the symbol
Revision Changes Path
1.24 +16 -20 apr/include/arch/unix/locks.h
Index: locks.h
===================================================================
RCS file: /home/cvs/apr/include/arch/unix/locks.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -u -r1.23 -r1.24
--- locks.h 2000/08/02 05:26:21 1.23
+++ locks.h 2000/12/06 19:53:42 1.24
@@ -62,37 +62,33 @@
#include "apr_lock.h"
/* System headers required by Locks library */
-#if HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#if HAVE_STRING_H
-#include <string.h>
-#endif
-#if HAVE_USLOCKS_H
-#include <uslocks.h>
-#endif
#if APR_HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
-#if HAVE_SYS_IPC_H
-#include <sys/ipc.h>
+#if APR_HAVE_STDIO_H
+#include <stdio.h>
+#endif
+#if APR_HAVE_FCNTL_H
+#include <fcntl.h>
#endif
-#if HAVE_SYS_SEM_H
+
+/* ### create APR_HAVE_* macros for these? */
+#ifdef HAVE_SYS_SEM_H
#include <sys/sem.h>
#endif
-#if HAVE_SYS_FILE_H
+#ifdef HAVE_SYS_FILE_H
#include <sys/file.h>
#endif
-#if APR_HAVE_STDIO_H
-#include <stdio.h>
-#endif
-#if HAVE_STDLIB_H
+#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
-#if APR_HAVE_FCNTL_H
-#include <fcntl.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
#endif
-#if HAVE_SYS_MMAN_H
+#ifdef HAVE_SYS_MMAN_H
#include <sys/mman.h>
#endif