Commit 3092c847 authored by Martin Kraemer's avatar Martin Kraemer
Browse files

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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90491 13f79535-47bb-0310-9956-ffa450edef68
parent b492048e

modules/aaa/mod_auth_ldap.c

+4 −3
Original line number Diff line number Diff line
@@ -60,13 +60,14 @@ 
 * Copyright 1999-2001 Dave Carrigan

 */



/* for getpid() */

#include <unistd.h>



#include <apr_ldap.h>

#include <apr_strings.h>



#include "ap_config.h"

#if APR_HAVE_UNISTD_H

/* for getpid() */

#include <unistd.h>

#endif

#include "httpd.h"

#include "http_config.h"

#include "http_core.h"

modules/ldap/util_ldap.c

+2 −0
Original line number Diff line number Diff line
@@ -77,7 +77,9 @@ 
#include "util_ldap.h"

#include "util_ldap_cache.h"



#if APR_HAVE_UNISTD_H

#include <unistd.h>

#endif



module AP_MODULE_DECLARE_DATA ldap_module;

modules/ssl/mod_ssl.h

+10 −3
Original line number Diff line number Diff line
@@ -97,9 +97,6 @@ 
#include <sys/types.h>

#include <sys/stat.h>

#include <time.h>

#if APR_HAVE_SYS_TIME_H

#include <sys/time.h>

#endif

/* XXX: these better go away */

#include <assert.h>
@@ -142,6 +139,16 @@ 
#include "ssl_util_ssl.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

 */

modules/ssl/ssl_expr_scan.c

+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ 
#ifdef __cplusplus



#include <stdlib.h>

#include <unistd.h>



/* Use prototypes in function declarations. */

#define YY_USE_PROTOS

server/mpm/worker/fdqueue.h

+2 −0
Original line number Diff line number Diff line
@@ -60,7 +60,9 @@ 
#define FDQUEUE_H

#include "httpd.h"

#include <stdlib.h>

#if APR_HAVE_UNISTD_H

#include <unistd.h>

#endif

#include <pthread.h>

#include <sys/types.h>

#include <sys/socket.h>