www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

Use uniform wrapping for unistd.h, and don't include it if it's aready included via fileio.h

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90491 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Martin Kraemer
2001-08-22 15:40:29 +00:00
parent 8354775eec
commit e811bc50a1
6 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/aaa/mod_auth_ldap.c
View File

@@ -60,13 +60,14 @@
* Copyright 1999-2001 Dave Carrigan * Copyright 1999-2001 Dave Carrigan
*/ */
/* for getpid() */
#include <unistd.h>
#include <apr_ldap.h> #include <apr_ldap.h>
#include <apr_strings.h> #include <apr_strings.h>
#include "ap_config.h" #include "ap_config.h"
#if APR_HAVE_UNISTD_H
/* for getpid() */
#include <unistd.h>
#endif
#include "httpd.h" #include "httpd.h"
#include "http_config.h" #include "http_config.h"
#include "http_core.h" #include "http_core.h"

2
modules/ldap/util_ldap.c
View File

@@ -77,7 +77,9 @@
#include "util_ldap.h" #include "util_ldap.h"
#include "util_ldap_cache.h" #include "util_ldap_cache.h"
#if APR_HAVE_UNISTD_H
#include <unistd.h> #include <unistd.h>
#endif
module AP_MODULE_DECLARE_DATA ldap_module; module AP_MODULE_DECLARE_DATA ldap_module;

13
modules/ssl/mod_ssl.h
View File

@@ -97,9 +97,6 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <time.h> #include <time.h>
#if APR_HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
/* XXX: these better go away */ /* XXX: these better go away */
#include <assert.h> #include <assert.h>
@@ -142,6 +139,16 @@
#include "ssl_util_ssl.h" #include "ssl_util_ssl.h"
#include "ssl_util_table.h" #include "ssl_util_table.h"
/* The #ifdef macros are only defined AFTER including the above
* therefore we cannot include these system files at the top :-(
*/
#if APR_HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
#if APR_HAVE_UNISTD_H
#include <unistd.h> /* needed for STDIN_FILENO et.al., at least on FreeBSD */
#endif
/* /*
* Provide reasonable default for some defines * Provide reasonable default for some defines
*/ */

1
modules/ssl/ssl_expr_scan.c
View File

@@ -38,7 +38,6 @@
#ifdef __cplusplus #ifdef __cplusplus
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h>
/* Use prototypes in function declarations. */ /* Use prototypes in function declarations. */
#define YY_USE_PROTOS #define YY_USE_PROTOS

2
server/mpm/worker/fdqueue.h
View File

@@ -60,7 +60,9 @@
#define FDQUEUE_H #define FDQUEUE_H
#include "httpd.h" #include "httpd.h"
#include <stdlib.h> #include <stdlib.h>
#if APR_HAVE_UNISTD_H
#include <unistd.h> #include <unistd.h>
#endif
#include <pthread.h> #include <pthread.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>

2
support/suexec.c
View File

@@ -74,7 +74,9 @@
#include <sys/types.h> #include <sys/types.h>
#include <string.h> #include <string.h>
#include <time.h> #include <time.h>
#if APR_HAVE_UNISTD_H
#include <unistd.h> #include <unistd.h>
#endif
#include <stdio.h> #include <stdio.h>
#include <stdarg.h> #include <stdarg.h>