Commit cc3135ef 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/modules/ssl@90491 13f79535-47bb-0310-9956-ffa450edef68
parent e89d4cc5

mod_ssl.h

+10 −3
Changes for mod_ssl.h: 10 added lines, 3 removed lines.
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

 */

ssl_expr_scan.c

+0 −1
Changes for ssl_expr_scan.c: 0 added lines, 1 removed line.
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