lots of includes and HAVE_FOO_H

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@2153 ec53bebd-3082-4978-b11e-865c3cabbd6b
1997-07-11 20:26:10 +00:00
parent d344d29f46
commit 5cdca3a638
18 changed files with 115 additions and 35 deletions
--- a/admin/admin_locl.h
+++ b/admin/admin_locl.h
@@ -12,13 +12,24 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_NETDB_H
+#include <netdb.h>
+#endif
+#include <roken.h>
 #include <krb5.h>
 #include <hdb_err.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>

 #include "hdb.h"

--- a/appl/rsh/rsh_locl.h
+++ b/appl/rsh/rsh_locl.h
@@ -7,21 +7,36 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <ctype.h>
-#include <unistd.h>
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
+#endif
+#ifdef HAVE_PWD_H
 #include <pwd.h>
+#endif
+#ifdef HAVE_NETDB_H
 #include <netdb.h>
+#endif
 #include <errno.h>
+
+#ifdef HAVE_SYSLOG_H
 #include <syslog.h>
+#endif
 #ifdef HAVE_PATHS_H
 #include <paths.h>
 #endif
+#include <roken.h>
 #include <krb.h>
 #include <prot.h>
 #include <krb5.h>
-#include <roken.h>

 #ifndef _PATH_NOLOGIN
 #define _PATH_NOLOGIN   "/etc/nologin"
--- a/kdc/kdc_locl.h
+++ b/kdc/kdc_locl.h
@@ -13,15 +13,25 @@
 #include <string.h>
 #include <errno.h>
 #include <signal.h>
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_NETDB_H
+#include <netdb.h>
+#endif
+#include <roken.h>
 #include <krb5.h>
 #include <hdb_err.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>

-#include <roken.h>
 #include "hdb.h"

 extern struct timeval now;
--- a/kuser/kuser_locl.h
+++ b/kuser/kuser_locl.h
@@ -10,9 +10,15 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <pwd.h>
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
+#ifdef HAVE_PWD_H
+#include <pwd.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
+#endif
 #include <roken.h>
 #include <krb5.h>

--- a/lib/gssapi/gssapi.h
+++ b/lib/gssapi/gssapi.h
@@ -12,16 +12,14 @@
 #include <config.h>
 #endif

+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif

 #ifdef HAVE_NETINET_IN6_MACHTYPES_H
 #include <netinet/in6_machtypes.h>
 #endif

-#ifdef HAVE_SYS_BITYPES_H
-#include <sys/bitypes.h>
-#endif
-
 #include <bits.h>

 /* I don't want to include krb.h here */
--- a/lib/gssapi/krb5/gssapi.h
+++ b/lib/gssapi/krb5/gssapi.h
@@ -12,16 +12,14 @@
 #include <config.h>
 #endif

+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif

 #ifdef HAVE_NETINET_IN6_MACHTYPES_H
 #include <netinet/in6_machtypes.h>
 #endif

-#ifdef HAVE_SYS_BITYPES_H
-#include <sys/bitypes.h>
-#endif
-
 #include <bits.h>

 /* I don't want to include krb.h here */
--- a/lib/krb5/crc.h
+++ b/lib/krb5/crc.h
@@ -1,6 +1,4 @@
 /* $Id$ */

-#include <sys/types.h>
-
 void crc_init_table (void);
 u_int32_t crc_update (char *p, size_t len, u_int32_t res);
--- a/lib/krb5/krb5.h
+++ b/lib/krb5/krb5.h
@@ -3,14 +3,19 @@
 #ifndef __KRB5_H__
 #define __KRB5_H__

-#include <sys/types.h>
-#include <sys/time.h>
-#include <stdarg.h>
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif

+#include <stdarg.h>
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+
 #ifdef HAVE_NETINET_IN6_MACHTYPES_H
 #include <netinet/in6_machtypes.h>
 #endif
--- a/lib/krb5/krb5_locl.h
+++ b/lib/krb5/krb5_locl.h
@@ -13,21 +13,42 @@
 #include <stdio.h>
 #include <stdlib.h>

-#include <unistd.h>
-#include <fcntl.h>
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
-#include <sys/ioctl.h>
-#include <pwd.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif

+#ifdef HAVE_SYS_IOCTL_H
+#include <sys/ioctl.h>
+#endif
+#ifdef HAVE_PWD_H
+#include <pwd.h>
+#endif
+
+#ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
+#endif
 #include <time.h>
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
+#endif
 #ifdef HAVE_NETINET_IN6_H
 #include <netinet/in6.h>
 #endif
+#ifdef HAVE_NETDB_H
 #include <netdb.h>
+#endif
 #ifdef HAVE_SYS_FILIO_H
 #include <sys/filio.h>
 #endif
--- a/lib/roken/getcwd.c
+++ b/lib/roken/getcwd.c
@@ -41,8 +41,12 @@
 RCSID("$Id$");
 #endif

+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
+#ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
+#endif

 #include "roken.h"

--- a/lib/roken/getdtablesize.c
+++ b/lib/roken/getdtablesize.c
@@ -43,7 +43,9 @@ RCSID("$Id$");

 #include "roken.h"

+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
 #include <time.h>
@@ -55,7 +57,9 @@ RCSID("$Id$");
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif

 #ifdef HAVE_SYS_RESOURCE_H
 #include <sys/resource.h>
--- a/lib/roken/hstrerror.c
+++ b/lib/roken/hstrerror.c
@@ -46,7 +46,9 @@ RCSID("$Id$");
 #ifndef HAVE_HSTRERROR

 #include <stdio.h>
+#ifdef HAVE_NETDB_H
 #include <netdb.h>
+#endif

 #ifndef HAVE_H_ERRNO
 int h_errno = -17; /* Some magic number */
--- a/lib/roken/memmove.c
+++ b/lib/roken/memmove.c
@@ -45,7 +45,9 @@ RCSID("$Id$");
 * memmove for systems that doesn't have it 
 */

+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif

 void* memmove(void *s1, const void *s2, size_t n)
 {
--- a/lib/roken/roken.h
+++ b/lib/roken/roken.h
@@ -186,11 +186,11 @@ struct passwd *k_getpwuid (uid_t uid);
 #endif

 #ifndef HAVE_SETEUID
-int seteuid(int euid);
+int seteuid(uid_t euid);
 #endif

 #ifndef HAVE_SETEGID
-int setegid(int egid);
+int setegid(gid_t egid);
 #endif

 #ifndef HAVE_LSTAT
--- a/lib/roken/roken.h.in
+++ b/lib/roken/roken.h.in
@@ -186,11 +186,11 @@ struct passwd *k_getpwuid (uid_t uid);
 #endif

 #ifndef HAVE_SETEUID
-int seteuid(int euid);
+int seteuid(uid_t euid);
 #endif

 #ifndef HAVE_SETEGID
-int setegid(int egid);
+int setegid(gid_t egid);
 #endif

 #ifndef HAVE_LSTAT
--- a/lib/roken/setegid.c
+++ b/lib/roken/setegid.c
@@ -41,12 +41,14 @@
 RCSID("$Id$");
 #endif

+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif

 #include "roken.h"

 int
-setegid(int egid)
+setegid(gid_t egid)
 {
 #ifdef HAVE_SETREGID
    return setregid(-1, egid);
--- a/lib/roken/seteuid.c
+++ b/lib/roken/seteuid.c
@@ -41,7 +41,9 @@
 RCSID("$Id$");
 #endif

+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif

 #include "roken.h"

--- a/lib/roken/strftime.c
+++ b/lib/roken/strftime.c
@@ -34,7 +34,9 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
 #include <time.h>