Cleanup header checks in configure.in

diff --git a/bin/afppasswd/afppasswd.c b/bin/afppasswd/afppasswd.c
index 4c56875d1d59e07566bb69e5829ba7869bb99c35..3125f53ffb7ddd88c04305bc37fd80a3abc3e006 100644 (file)
--- a/bin/afppasswd/afppasswd.c
+++ b/bin/afppasswd/afppasswd.c
@@ -28,16 +28,12 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif /* HAVE_UNISTD_H */
 #include <ctype.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/param.h>
-#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
-#endif /* HAVE_FCNTL_H */
 #include <pwd.h>
 
 #include <netatalk/endian.h>

diff --git a/bin/megatron/asingle.c b/bin/megatron/asingle.c
index 467ac5f7eb302ab576a70b8b7dafe5716eeb61f2..73e4ffaaff1022e6bc60a160ae2d550338b56d17 100644 (file)
--- a/bin/megatron/asingle.c
+++ b/bin/megatron/asingle.c
@@ -10,16 +10,13 @@
 #include <sys/uio.h>
 #include <sys/time.h>
 #include <sys/param.h>
-#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
-#endif /* HAVE_FCNTL_H */
 #include <time.h>
 #include <string.h>
 #include <ctype.h>
 #include <stdio.h>
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+
 #include <atalk/adouble.h>
 #include <netatalk/endian.h>
 #include "asingle.h"

diff --git a/bin/megatron/hqx.c b/bin/megatron/hqx.c
index 117c9dd65d08b0726ab83168cfb18c83a93aa89f..da2f71cf58f04f7c25d6a0851fd8d8659ff78605 100644 (file)
--- a/bin/megatron/hqx.c
+++ b/bin/megatron/hqx.c
@@ -18,9 +18,7 @@
 #include <time.h>
 
 #include <unistd.h>
-#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
-#endif /* HAVE_FCNTL_H */
 
 #include <netinet/in.h>
 

diff --git a/bin/megatron/macbin.c b/bin/megatron/macbin.c
index 73ae629204b4ff0afd55b417a03e72cbe61062ef..51b7ac5f616ede35aeb604892e423e3bbf4a35e6 100644 (file)
--- a/bin/megatron/macbin.c
+++ b/bin/megatron/macbin.c
@@ -10,12 +10,8 @@
 #include <sys/uio.h>
 #include <sys/time.h>
 #include <sys/param.h>
-#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
-#endif /* HAVE_FCNTL_H */
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif /* HAVE_UNISTD_H */
 #include <string.h>
 #include <strings.h>
 #include <ctype.h>

diff --git a/bin/megatron/megatron.c b/bin/megatron/megatron.c
index 1dc83d777c0991e5f4d7a85b911930f63b6143f8..f47a6dac7c8e9b681b57c01c22cf771e32ce5ebf 100644 (file)
--- a/bin/megatron/megatron.c
+++ b/bin/megatron/megatron.c
@@ -10,9 +10,7 @@
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/uio.h>
-#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
-#endif /* HAVE_FCNTL_H */
 #include <time.h>
 #include <ctype.h>
 #include <stdio.h>

diff --git a/bin/megatron/nad.c b/bin/megatron/nad.c
index 92be35413fc8ed3c17a91ef2dc120e42ea5e55bc..9d0b64bf5627612a6bfeb1502d0512b6b8d27f1a 100644 (file)
--- a/bin/megatron/nad.c
+++ b/bin/megatron/nad.c
@@ -16,9 +16,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <dirent.h>
-#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
-#endif /* HAVE_FCNTL_H */
 
 #include <atalk/adouble.h>
 #include <atalk/util.h>

diff --git a/configure.in b/configure.in
index 628d1a682a1f60a30d5fa5ba9e90f263420f433a..9613321283e4aeae5d4c45b277df78b3c4b926c0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -23,43 +23,27 @@ AC_PROG_GREP
 AC_PROG_PS
 AM_PROG_CC_C_O
 
+dnl Checks for typedefs, structures, and compiler characteristics.
+AC_C_INLINE
+
 dnl Request SUSv3 standard interfaces plus anything else the platform may have
 CFLAGS="$CFLAGS -D_XOPEN_SOURCE=600 -D__EXTENSIONS__ -D_GNU_SOURCE"
 
-dnl Checks for header files.
-AC_HEADER_STDC
-AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(fcntl.h limits.h stdint.h strings.h time.h stdarg.h)
-AC_CHECK_HEADERS(mntent.h syslog.h unistd.h termios.h ufs/quota.h)
-AC_CHECK_HEADERS(netdb.h sgtty.h mount.h statfs.h dlfcn.h errno.h langinfo.h locale.h)
-AC_CHECK_HEADERS(sys/param.h sys/fcntl.h sys/file.h sys/ioctl.h sys/time.h)
+dnl Checks for header files, some checks are obsolete, unfortunately the code
+dnl uses the resulting macros, so the code has to cleaned up too before
+dnl we can remove the checks here.
+AC_CHECK_HEADERS(mntent.h unistd.h termios.h ufs/quota.h)
+AC_CHECK_HEADERS(netdb.h sgtty.h statfs.h dlfcn.h langinfo.h locale.h)
+AC_CHECK_HEADERS(sys/param.h sys/fcntl.h sys/termios.h)
 AC_CHECK_HEADERS(sys/mnttab.h sys/statvfs.h sys/stat.h sys/vfs.h)
-AC_CHECK_HEADERS(sys/termios.h sys/types.h sys/errno.h sys/uio.h sys/filio.h)
 dnl Checks for header files, conformed to be required as of 2011
 AC_CHECK_HEADERS(sys/epoll.h)
-
-AC_CHECK_HEADER(sys/cdefs.h,,
-       AC_MSG_RESULT([enabling generic cdefs.h from tree])
-       CFLAGS="-I\$(top_srcdir)/sys/generic $CFLAGS"
-)
-
 AC_CHECK_HEADERS([sys/mount.h], , , 
 [#ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif
 ])
 
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_UID_T
-AC_C_INLINE
-AC_TYPE_MODE_T
-AC_TYPE_OFF_T
-AC_TYPE_PID_T
-AC_TYPE_SIZE_T
-AC_STRUCT_ST_RDEV
-AC_HEADER_TIME
-AC_STRUCT_TM
 
 dnl --------------------------------------------------------------------------
 dnl check if dlsym needs to add an underscore, uses libtool macros 
@@ -1363,8 +1347,6 @@ AC_OUTPUT([Makefile
        man/man5/Makefile
        man/man8/Makefile
        sys/Makefile
-       sys/generic/Makefile
-       sys/generic/sys/Makefile
        sys/netatalk/Makefile
        sys/netbsd/Makefile
        sys/netbsd/netatalk/Makefile

diff --git a/etc/afpd/afp_asp.c b/etc/afpd/afp_asp.c
index 85c412e11d3dcb6ceb52232a082837a1ed6f70fc..7cb4028ca1964243165fc9e7aef6e3d10bfa94c0 100644 (file)
--- a/etc/afpd/afp_asp.c
+++ b/etc/afpd/afp_asp.c
@@ -20,9 +20,7 @@
 #include <signal.h>
 #include <atalk/logger.h>
 #include <errno.h>
-#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
-#endif /* HAVE_SYS_TIME_H */
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif /* HAVE_SYS_STAT_H */

diff --git a/etc/afpd/afp_config.h b/etc/afpd/afp_config.h
index 1a0d08ef8859426a5e7fa8d113046d95308ff2c3..5db8217846abdf85f48e892b4c7d3caf8cfede28 100644 (file)
--- a/etc/afpd/afp_config.h
+++ b/etc/afpd/afp_config.h
@@ -1,16 +1,9 @@
-/*
- * $Id: afp_config.h,v 1.5 2009-10-13 22:55:36 didg Exp $
- */
-
 #ifndef AFPD_CONFIG_H
 #define AFPD_CONFIG_H 1
 
-#ifdef HAVE_SYS_CDEFS_H
-#include <sys/cdefs.h>
-#endif /* HAVE_SYS_CDEFS_H */
-
 #include <atalk/server_child.h>
 #include <atalk/atp.h>
+
 #include "globals.h"
 
 typedef struct AFPConfig {

diff --git a/etc/afpd/afprun.c b/etc/afpd/afprun.c
index cd506a58ca2aadce8f13238aa4eb451f496b97ee..74a732e60bdd3a2359754aceb162d1bc58606342 100644 (file)
--- a/etc/afpd/afprun.c
+++ b/etc/afpd/afprun.c
@@ -26,17 +26,12 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-
 #include <sys/types.h>
-#define __USE_GNU 1
+/* #define __USE_GNU 1 */
 #include <unistd.h>
 
 #include <errno.h>
-
-#ifdef HAVE_SYS_WAIT_H 
 #include <sys/wait.h>
-#endif
-
 #include <sys/param.h>  
 #include <string.h>
 

diff --git a/etc/afpd/auth.c b/etc/afpd/auth.c
index 6027b8515850760ec8f4274907ae3be95b70e19a..7d50476481fe429d1d56342c537d4053d5a9219a 100644 (file)
--- a/etc/afpd/auth.c
+++ b/etc/afpd/auth.c
@@ -10,9 +10,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif /* HAVE_UNISTD_H */
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/stat.h>

diff --git a/etc/afpd/auth.h b/etc/afpd/auth.h
index 21574c29e83f31c8a756a222df113f78dc9eb27d..e7f141ba0f426f07bf7685bebc07fbac90498252 100644 (file)
--- a/etc/afpd/auth.h
+++ b/etc/afpd/auth.h
@@ -1,6 +1,4 @@
 /*
- * $Id: auth.h,v 1.9 2009-10-15 10:43:13 didg Exp $
- *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
  */
@@ -8,13 +6,7 @@
 #ifndef AFPD_AUTH_H
 #define AFPD_AUTH_H 1
 
-#ifdef HAVE_LIMITS_H
 #include <limits.h>
-#endif /* HAVE_LIMITS_H */
-
-#ifdef HAVE_SYS_CDEFS_H
-#include <sys/cdefs.h>
-#endif /* HAVE_SYS_CDEFS_H */
 
 #include "globals.h"
 

diff --git a/etc/afpd/desktop.h b/etc/afpd/desktop.h
index 039fa6aea77ea8ecc50f6f1cb0537bcd24ca9b57..c9d0e99e3f22b39c98725d0bd98afa2125d0f476 100644 (file)
--- a/etc/afpd/desktop.h
+++ b/etc/afpd/desktop.h
@@ -26,7 +26,6 @@
 #ifndef AFPD_DESKTOP_H
 #define AFPD_DESKTOP_H 1
 
-#include <sys/cdefs.h>
 #include "globals.h"
 #include "volume.h"
 

diff --git a/etc/afpd/directory.h b/etc/afpd/directory.h
index 76267e73b9dac151a088c175af46d8348468dae3..5bc922b59c8db37e0c6a57e8f2cd8526f7c979af 100644 (file)
--- a/etc/afpd/directory.h
+++ b/etc/afpd/directory.h
@@ -24,7 +24,6 @@
 #ifndef AFPD_DIRECTORY_H
 #define AFPD_DIRECTORY_H 1
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 /*#include <sys/stat.h>*/ /* including it here causes some confusion */
 #include <netatalk/endian.h>

diff --git a/etc/afpd/file.h b/etc/afpd/file.h
index 483f6be61a4d264fe74910a6f8c66a22a3b29f35..5839084688a0641d54ca194fdd5116577a2fe74d 100644 (file)
--- a/etc/afpd/file.h
+++ b/etc/afpd/file.h
@@ -1,6 +1,4 @@
 /*
- * $Id: file.h,v 1.26 2010/03/12 15:16:49 franklahm Exp $
- *
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
  * All Rights Reserved.
  *
@@ -28,7 +26,6 @@
 
 /*#include <sys/stat.h>*/ /* including it here causes some confusion */
 #include <sys/param.h>
-#include <sys/cdefs.h>
 #include <netatalk/endian.h>
 #include <atalk/adouble.h>
 

diff --git a/etc/afpd/filedir.c b/etc/afpd/filedir.c
index ebde9655e6ef754816621813d6912eee60b0909c..9ec0271aab269530e2d567585ce8c09ebdb24e51 100644 (file)
--- a/etc/afpd/filedir.c
+++ b/etc/afpd/filedir.c
@@ -10,9 +10,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
 #include <errno.h>
 #include <sys/param.h>
 

diff --git a/etc/afpd/filedir.h b/etc/afpd/filedir.h
index c5b857567db4fdf6e1318c8c60d897ae7afbaf82..9645bc00823e01b95fc9dd26424d8d60b9b5d5e1 100644 (file)
--- a/etc/afpd/filedir.h
+++ b/etc/afpd/filedir.h
@@ -1,11 +1,6 @@
-/*
- * $Id: filedir.h,v 1.11 2009-10-15 10:43:13 didg Exp $
- */
-
 #ifndef AFPD_FILEDIR_H
 #define AFPD_FILEDIR_H 1
 
-#include <sys/cdefs.h>
 #include <sys/stat.h>
 #include "globals.h"
 #include "volume.h"

diff --git a/etc/afpd/fork.h b/etc/afpd/fork.h
index ab75f1f7930856b8e03a206299d880ce97b6e62c..151ffcf554062014ba1df388f82f7471a5dd0f58 100644 (file)
--- a/etc/afpd/fork.h
+++ b/etc/afpd/fork.h
@@ -7,7 +7,6 @@
 #define AFPD_FORK_H 1
 
 #include <stdio.h>
-#include <sys/cdefs.h>
 
 #include <netatalk/endian.h>
 #include <atalk/adouble.h>

diff --git a/etc/afpd/globals.h b/etc/afpd/globals.h
index e37ebf64644d7546e8a35f7dc8dc5cd9926af090..ed91c522d59ea10a5ff6224e504556a6d8e89fef 100644 (file)
--- a/etc/afpd/globals.h
+++ b/etc/afpd/globals.h
@@ -7,7 +7,6 @@
 #define AFPD_GLOBALS_H 1
 
 #include <sys/param.h>
-#include <sys/cdefs.h>
 
 #ifdef ADMIN_GRP
 #include <grp.h>

diff --git a/etc/afpd/icon.h b/etc/afpd/icon.h
index 47815e3d85de794eb5be2039e42457ec25496ee4..2c90683afc86fb6bd7bb104311b3e9b7fb9cda75 100644 (file)
--- a/etc/afpd/icon.h
+++ b/etc/afpd/icon.h
@@ -1,6 +1,4 @@
 /*
- * $Id: icon.h,v 1.5 2009-10-16 00:11:42 didg Exp $
- *
  * Copyright (c) 1990,1994 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
  */
@@ -8,7 +6,6 @@
 #ifndef AFPD_ICON_H
 #define AFPD_ICON_H 1
 
-#include <sys/cdefs.h>
 #include "globals.h"
 
 static const unsigned char apple_atalk_icon[] = { /* default appletalk icon */

diff --git a/etc/afpd/messages.c b/etc/afpd/messages.c
index 13e03f4066cb7fc6cca11fb0ae588846a6fde615..975ec7a975fda8156ad4738e87152c006c80d2a4 100644 (file)
--- a/etc/afpd/messages.c
+++ b/etc/afpd/messages.c
@@ -1,6 +1,4 @@
 /*
- * $Id: messages.c,v 1.23 2009-11-24 15:44:40 didg Exp $
- *
  * Copyright (c) 1997 Adrian Sun (asun@zoology.washington.edu)
  * All Rights Reserved.  See COPYRIGHT.
  */
@@ -9,9 +7,7 @@
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif /* HAVE_UNISTD_H */
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>

diff --git a/etc/afpd/misc.h b/etc/afpd/misc.h
index dded79b13bd2d1b762acd5d7b9374dc2dc7b18cc..33a83432c88243aec33451f596199d3f328f9145 100644 (file)
--- a/etc/afpd/misc.h
+++ b/etc/afpd/misc.h
@@ -1,11 +1,6 @@
-/*
- * $Id: misc.h,v 1.5 2009-10-15 10:43:13 didg Exp $
- */
-
 #ifndef AFPD_MISC_H
 #define AFPD_MISC_H 1
 
-#include <sys/cdefs.h>
 #include "globals.h"
 
 /* FP functions */

diff --git a/etc/afpd/quota.c b/etc/afpd/quota.c
index 06008c20f6140a627ad1aab9ff308d7aceaea0ca..1a04ada07511050f9ad1bfe847ba0f7ab4ec0f17 100644 (file)
--- a/etc/afpd/quota.c
+++ b/etc/afpd/quota.c
@@ -19,12 +19,8 @@
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/param.h>
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif /* HAVE_UNISTD_H */
-#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
-#endif /* HAVE_FCNTL_H */
 
 #include <atalk/logger.h>
 #include <atalk/afp.h>

diff --git a/etc/afpd/status.h b/etc/afpd/status.h
index 3a29a17418f092681bbf986e7de0a6b365158f91..0db90fd5d3434748c48c3b76d49d9ff79256e7e9 100644 (file)
--- a/etc/afpd/status.h
+++ b/etc/afpd/status.h
@@ -1,7 +1,6 @@
 #ifndef AFPD_STATUS_H
 #define AFPD_STATUS_H 1
 
-#include <sys/cdefs.h>
 #include <atalk/dsi.h>
 #include <atalk/asp.h>
 #include "globals.h"

diff --git a/etc/afpd/uam.c b/etc/afpd/uam.c
index 8e247a248a423136613961c1a9199715196cbf44..18f57ea1eef7bfe0cecfc0211a6bc4c6e21faac5 100644 (file)
--- a/etc/afpd/uam.c
+++ b/etc/afpd/uam.c
@@ -12,12 +12,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif /* HAVE_UNISTD_H */
-#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
-#endif /* HAVE_FCNTL_H */
 #include <ctype.h>
 #include <atalk/logger.h>
 #include <sys/param.h>

diff --git a/etc/afpd/uam_auth.h b/etc/afpd/uam_auth.h
index 7c879b313797300d85b00d209dbc8224dca98e82..368dc3b60d0556c02c84f4ce08cdd30cb0643f1a 100644 (file)
--- a/etc/afpd/uam_auth.h
+++ b/etc/afpd/uam_auth.h
@@ -1,6 +1,4 @@
 /*
- * $Id: uam_auth.h,v 1.7 2009-10-22 12:35:38 franklahm Exp $
- *
  * Copyright (c) 1999 Adrian Sun (asun@zoology.washington.edu)
  * All Rights Reserved.  See COPYRIGHT.
  *
@@ -10,7 +8,6 @@
 #ifndef AFPD_UAM_AUTH_H
 #define AFPD_UAM_AUTH_H 1
 
-#include <sys/cdefs.h>
 #include <pwd.h>
 
 #include <atalk/uam.h>

diff --git a/etc/afpd/unix.h b/etc/afpd/unix.h
index c663ecac2371ac98dc7915ee72ac700fb9b8116f..a47f562adb82e6a37e5cc948fafd161e8f8a2daf 100644 (file)
--- a/etc/afpd/unix.h
+++ b/etc/afpd/unix.h
@@ -1,13 +1,6 @@
-/*
- * $Id: unix.h,v 1.23 2010-04-12 14:28:47 franklahm Exp $
- */
-
 #ifndef AFPD_UNIX_H
 #define AFPD_UNIX_H
 
-#ifdef HAVE_SYS_CDEFS_H
-#include <sys/cdefs.h>
-#endif /* HAVE_SYS_CDEFS_H */
 #include <netatalk/endian.h>
 #include "config.h"
 #include "volume.h"

diff --git a/etc/afpd/volume.c b/etc/afpd/volume.c
index 8967860503853a80510d4219fbe3ac6c074d7513..cc4ddc98c6e190141836192aae603a625844d172 100644 (file)
--- a/etc/afpd/volume.c
+++ b/etc/afpd/volume.c
@@ -14,9 +14,6 @@
 #include <grp.h>
 #include <utime.h>
 #include <errno.h>
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
 #include <string.h>
 #include <sys/param.h>
 #include <sys/socket.h>

diff --git a/etc/afpd/volume.h b/etc/afpd/volume.h
index b33e9c313cf22713ccf738efcb3758b4b07a1dea..2b689faf570bdb17154bc9aa3a3747ffe2c51261 100644 (file)
--- a/etc/afpd/volume.h
+++ b/etc/afpd/volume.h
@@ -6,7 +6,6 @@
 #ifndef AFPD_VOLUME_H
 #define AFPD_VOLUME_H 1
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <netatalk/endian.h>
 

diff --git a/etc/cnid_dbd/db_param.h b/etc/cnid_dbd/db_param.h
index 67ec62e4e18c8fc6f40c5f02c8e9f5aa72948621..d8f3c9103d278c2bbf03f5626f7788138d393e3a 100644 (file)
--- a/etc/cnid_dbd/db_param.h
+++ b/etc/cnid_dbd/db_param.h
@@ -8,7 +8,6 @@
 #define CNID_DBD_DB_PARAM_H 1
 
 #include <sys/param.h>
-#include <sys/cdefs.h>
 
 struct db_param {
     char *dir;

diff --git a/etc/cnid_dbd/dbd_add.c b/etc/cnid_dbd/dbd_add.c
index 6a818a3b325063f27fe37a0a412d6081bf6bb0b8..418a10f9da9a22919780b5ade075c5e35eecac1f 100644 (file)
--- a/etc/cnid_dbd/dbd_add.c
+++ b/etc/cnid_dbd/dbd_add.c
@@ -9,16 +9,10 @@
 #endif /* HAVE_CONFIG_H */
 
 #include <string.h>
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif /* HAVE_UNISTD_H */
-#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
-#endif /* HAVE_FCNTL_H */
 #include <errno.h>
-#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
-#endif /* HAVE_SYS_TIME_H */
 
 #include <atalk/logger.h>
 #include <atalk/cnid_dbd_private.h>

diff --git a/etc/cnid_dbd/dbif.c b/etc/cnid_dbd/dbif.c
index 2b5b91ac0f3bcdd7f397b26193840e9f193bbf2d..1310d61c1462ed33f1c1767e0eb0a5722731b709 100644 (file)
--- a/etc/cnid_dbd/dbif.c
+++ b/etc/cnid_dbd/dbif.c
@@ -14,7 +14,6 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/cdefs.h>
 #include <unistd.h>
 
 #include <db.h>

diff --git a/etc/cnid_dbd/dbif.h b/etc/cnid_dbd/dbif.h
index 9c886fb1f9d60e960c099cb0b5c4920ab2af575c..2be8c0b1a5ac9469b2b8b3031c38eeaedb8c2d00 100644 (file)
--- a/etc/cnid_dbd/dbif.h
+++ b/etc/cnid_dbd/dbif.h
@@ -53,7 +53,6 @@
 #ifndef CNID_DBD_DBIF_H
 #define CNID_DBD_DBIF_H 1
 
-#include <sys/cdefs.h>
 #include <db.h>
 #include <atalk/adouble.h>
 #include "db_param.h"

diff --git a/etc/cnid_dbd/main.c b/etc/cnid_dbd/main.c
index ec0793cb9ceb2beebe4c1c350408fe19eb97ee38..e967f4f8765f3a7eb47831496e8b8eb59be843bc 100644 (file)
--- a/etc/cnid_dbd/main.c
+++ b/etc/cnid_dbd/main.c
@@ -8,24 +8,16 @@
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif /* HAVE_UNISTD_H */
-#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
-#endif /* HAVE_FCNTL_H */
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <signal.h>
 #include <string.h>
-#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
-#endif /* HAVE_SYS_TYPES_H */
 #include <sys/param.h>
-#ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
-#endif /* HAVE_SYS_STAT_H */
 #include <time.h>
 #include <sys/file.h>
 

diff --git a/etc/cnid_dbd/pack.c b/etc/cnid_dbd/pack.c
index 2612469415eaa5582d71712bca82dc5b63c33770..f37ac67d716d0366aeb376f5f19c244feef942c4 100644 (file)
--- a/etc/cnid_dbd/pack.c
+++ b/etc/cnid_dbd/pack.c
@@ -13,7 +13,6 @@
 #include <string.h>
 #include <inttypes.h>
 #include <sys/param.h>
-#include <sys/cdefs.h>
 #include <db.h>
 
 #include <atalk/unicode.h>

diff --git a/etc/cnid_dbd/usockfd.c b/etc/cnid_dbd/usockfd.c
index ceb6ff211ad6628693b18e48bb2c1fbec2925c03..ff1538b340c334c2428457455c8e3cf2bfda9f21 100644 (file)
--- a/etc/cnid_dbd/usockfd.c
+++ b/etc/cnid_dbd/usockfd.c
@@ -11,22 +11,14 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif /* HAVE_UNISTD_H */
 #include <sys/un.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
-
-#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
-#endif /* HAVE_SYS_TYPES_H */
-#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
-#endif /* HAVE_SYS_TIME_H */
-
 
 #include <atalk/logger.h>
 #include "usockfd.h"

diff --git a/etc/uams/uams_dhx2_passwd.c b/etc/uams/uams_dhx2_passwd.c
index 0f07333b1afcabe192c2298dc2b1000b2114e1e7..2f3639db2971f0028e90d236fe18bc7092f1e4d1 100644 (file)
--- a/etc/uams/uams_dhx2_passwd.c
+++ b/etc/uams/uams_dhx2_passwd.c
@@ -25,21 +25,14 @@
 #define _XOPEN_SOURCE /* for crypt() */
 #endif
 
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif
 
 #ifdef HAVE_CRYPT_H
 #include <crypt.h>
 #endif
 
-#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
-#endif
-
-#ifdef HAVE_TIME_H
 #include <time.h>
-#endif
 
 #ifdef SHADOWPW
 #include <shadow.h>

diff --git a/etc/uams/uams_dhx_passwd.c b/etc/uams/uams_dhx_passwd.c
index bc91aca60cf80599fd7f069a7658b0b2424d8985..a6a600ed496bca8e2bb35f31c68bdd36e4eca1bc 100644 (file)
--- a/etc/uams/uams_dhx_passwd.c
+++ b/etc/uams/uams_dhx_passwd.c
@@ -1,6 +1,4 @@
 /*
- * $Id: uams_dhx_passwd.c,v 1.29 2010-03-30 12:44:35 franklahm Exp $
- *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * Copyright (c) 1999 Adrian Sun (asun@u.washington.edu) 
  * All Rights Reserved.  See COPYRIGHT.
@@ -20,22 +18,18 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif /* HAVE_UNISTD_H */
 #ifdef HAVE_CRYPT_H
 #include <crypt.h>
 #endif /* ! HAVE_CRYPT_H */
-#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
-#endif
-#ifdef HAVE_TIME_H
 #include <time.h>
-#endif
 #include <pwd.h>
+
 #ifdef SHADOWPW
 #include <shadow.h>
 #endif /* SHADOWPW */
+
 #if defined(GNUTLS_DHX)
 #include <gnutls/openssl.h>
 #elif defined(OPENSSL_DHX)

diff --git a/etc/uams/uams_krb4/uams_krb4.c b/etc/uams/uams_krb4/uams_krb4.c
index 1d2727a8fa4a76f5cc90313f02a2fa10a812870c..35b14930fc9a32ebace5436202c7d6f67ce54170 100644 (file)
--- a/etc/uams/uams_krb4/uams_krb4.c
+++ b/etc/uams/uams_krb4/uams_krb4.c
@@ -10,12 +10,8 @@
 #endif /* HAVE_CONFIG_H */
 
 #if defined( KRB ) || defined( UAM_AFSKRB )
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif /* HAVE_UNISTD_H */
-#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
-#endif /* HAVE_FCNTL_H */
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/stat.h>

diff --git a/etc/uams/uams_passwd.c b/etc/uams/uams_passwd.c
index 507cb04f791bfcdbe0badd632f8f04040ac182e7..b2eb584a0fb8b85d56a0ecdf322620d12859562b 100644 (file)
--- a/etc/uams/uams_passwd.c
+++ b/etc/uams/uams_passwd.c
@@ -1,6 +1,4 @@
 /*
- * $Id: uams_passwd.c,v 1.31 2010-03-30 12:44:35 franklahm Exp $
- *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * Copyright (c) 1999 Adrian Sun (asun@u.washington.edu) 
  * All Rights Reserved.  See COPYRIGHT.
@@ -22,19 +20,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif /* HAVE_UNISTD_H */
 #ifdef HAVE_CRYPT_H
 #include <crypt.h>
 #endif /* ! HAVE_CRYPT_H */
 #include <pwd.h>
-#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
-#endif
-#ifdef HAVE_TIME_H
 #include <time.h>
-#endif
 #ifdef SHADOWPW
 #include <shadow.h>
 #endif /* SHADOWPW */

diff --git a/etc/uams/uams_randnum.c b/etc/uams/uams_randnum.c
index c9a275ba792d2394befb2760b2bd095794c8ff8b..0791ef32cd69110d4bde3c20ad90ce9e0b7a446f 100644 (file)
--- a/etc/uams/uams_randnum.c
+++ b/etc/uams/uams_randnum.c
@@ -13,12 +13,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif /* HAVE_UNISTD_H */
-#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
-#endif /* HAVE_FCNTL_H */
 #include <ctype.h>
 #include <pwd.h>
 #include <sys/stat.h>

diff --git a/include/atalk/adouble.h b/include/atalk/adouble.h
index 4ad6c20ca5bcb02d3d6bb7c843b1578963cecd92..7c6f485d952e7697606aff1f791d2383f4f8107a 100644 (file)
--- a/include/atalk/adouble.h
+++ b/include/atalk/adouble.h
@@ -37,7 +37,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <sys/cdefs.h>
 #include <fcntl.h>
 #include <sys/mman.h>
 #include <sys/time.h>

diff --git a/include/atalk/asp.h b/include/atalk/asp.h
index 44b2388d991773622868cec7aafc118b20d32ee1..58b5aaa0e962e1385cd7d0bd5a02740015ea2818 100644 (file)
--- a/include/atalk/asp.h
+++ b/include/atalk/asp.h
@@ -25,7 +25,6 @@
 #define _ATALK_ASP_H 1
 
 #include <sys/types.h>
-#include <sys/cdefs.h>
 #include <netatalk/endian.h>
 #include <netatalk/at.h>
 #include <atalk/atp.h>

diff --git a/include/atalk/atp.h b/include/atalk/atp.h
index 48e5dfdd0edccb2b3b2e31317a8479d324763547..3be08e5d008c72721ee2d102de3b33d6b864aa05 100644 (file)
--- a/include/atalk/atp.h
+++ b/include/atalk/atp.h
@@ -1,6 +1,4 @@
 /*
- * $Id: atp.h,v 1.5 2009-10-13 22:55:37 didg Exp $
- *
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
  * All Rights Reserved.
  *
@@ -26,7 +24,6 @@
 #ifndef _ATALK_ATP_H
 #define _ATALK_ATP_H 1
  
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <netatalk/at.h>

diff --git a/include/atalk/compat.h b/include/atalk/compat.h
index f66c3a3145977960869eb6c17ad76aba39ac8c6e..1c217c4ca752d4e34fc5a552c06ff16e9c2514ba 100644 (file)
--- a/include/atalk/compat.h
+++ b/include/atalk/compat.h
@@ -6,7 +6,6 @@
  * are checks for EINTR everywhere. 
  */
 
-#include <sys/cdefs.h>
 #include <signal.h>
 
 #include "config.h"

diff --git a/include/atalk/directory.h b/include/atalk/directory.h
index d15c048940e772229334e10f5f50aad76eefb9da..d90bc26c254aa12f526df3cf62510800acee613f 100644 (file)
--- a/include/atalk/directory.h
+++ b/include/atalk/directory.h
@@ -24,7 +24,6 @@
 #ifndef ATALK_DIRECTORY_H
 #define ATALK_DIRECTORY_H 1
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <netatalk/endian.h>
 #include <dirent.h>

diff --git a/include/atalk/dsi.h b/include/atalk/dsi.h
index 713ed1fba647a49848f5e4fcb5ff6f7deec0f5ee..edb13069cef832f34ec10784e63686edbd244bca 100644 (file)
--- a/include/atalk/dsi.h
+++ b/include/atalk/dsi.h
@@ -6,7 +6,6 @@
 #ifndef _ATALK_DSI_H 
 #define _ATALK_DSI_H
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/socket.h>

diff --git a/include/atalk/nbp.h b/include/atalk/nbp.h
index aa4190446a355b3938caa6eeb120e8e5743b3b99..a1fb271400e4367fbbe38586e6c55a2eeccc99ec 100644 (file)
--- a/include/atalk/nbp.h
+++ b/include/atalk/nbp.h
@@ -26,7 +26,6 @@
 #define NBP_UNRGSTR_4ARGS 1
 #define ATP_OPEN_2ARGS 1
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <netatalk/at.h>
 #include <netatalk/endian.h>

diff --git a/include/atalk/netddp.h b/include/atalk/netddp.h
index bf1c9bd3a8007407c8a3739597ab3f9835432830..7bf08b72636c261460a0121c2e3c57cb2683df2a 100644 (file)
--- a/include/atalk/netddp.h
+++ b/include/atalk/netddp.h
@@ -1,6 +1,4 @@
 /*
- * $Id: netddp.h,v 1.4 2009-10-13 22:55:37 didg Exp $
- *
  * Copyright (c) 1999 Adrian Sun (asun@zoology.washington.edu)
  * All Rights Reserved. See COPYRIGHT.
  *
@@ -14,7 +12,6 @@
 #define _ATALK_NETDDP_H 1
 
 #include <sys/types.h>
-#include <sys/cdefs.h>
 #include <sys/socket.h>
 #include <netatalk/at.h>
 

diff --git a/include/atalk/server_child.h b/include/atalk/server_child.h
index 8479367bb4f42b2c8786d0ce4a48145aef07b659..15ea49867ffbcadd28e86124d02af5cfc5cb17b3 100644 (file)
--- a/include/atalk/server_child.h
+++ b/include/atalk/server_child.h
@@ -6,7 +6,6 @@
 #ifndef _ATALK_SERVER_CHILD_H
 #define _ATALK_SERVER_CHILD_H 1
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <netatalk/endian.h>
 

diff --git a/include/atalk/uam.h b/include/atalk/uam.h
index 0fb199b3962f9103fb839521120883112eff9a88..ea85325745cc6ae20bc2eb25fdd2f06a8ad1d29d 100644 (file)
--- a/include/atalk/uam.h
+++ b/include/atalk/uam.h
@@ -5,7 +5,6 @@
 #ifndef UAM_H
 #define UAM_H 1
 
-#include <sys/cdefs.h>
 #include <pwd.h>
 #include <stdarg.h>
 

diff --git a/include/atalk/unicode.h b/include/atalk/unicode.h
index 1cea56c4d13347481fc687ac379a39d649c4ffaf..146f6db9aba43e1418245b88bb98a3763f286b21 100644 (file)
--- a/include/atalk/unicode.h
+++ b/include/atalk/unicode.h
@@ -1,7 +1,6 @@
 #ifndef _ATALK_UNICODE_H
 #define _ATALK_UNICODE_H 1
 
-#include <sys/cdefs.h>
 #include <netatalk/endian.h>
 #include <errno.h>
 #include <sys/param.h>

diff --git a/include/atalk/util.h b/include/atalk/util.h
index d60485e1614d3d0d54a546dedf455529f9221494..4818c87a681d5abb829e3303b17dd5e6f365437b 100644 (file)
--- a/include/atalk/util.h
+++ b/include/atalk/util.h
@@ -11,7 +11,6 @@
 #ifndef _ATALK_UTIL_H
 #define _ATALK_UTIL_H 1
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <unistd.h>

diff --git a/include/atalk/volume.h b/include/atalk/volume.h
index f213502d7111bb9dc97352d7b17f452c82ecafa0..fe80faca9902f0684c0e17672f12b5892fe2e122 100644 (file)
--- a/include/atalk/volume.h
+++ b/include/atalk/volume.h
@@ -1,6 +1,4 @@
 /*
- * $Id: volume.h,v 1.16 2010/03/31 09:47:32 franklahm Exp $
- *
  * Copyright (c) 1990,1994 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
  */
@@ -8,7 +6,6 @@
 #ifndef ATALK_VOLUME_H
 #define ATALK_VOLUME_H 1
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <netatalk/endian.h>
 

diff --git a/libatalk/cnid/cdb/cnid_cdb.h b/libatalk/cnid/cdb/cnid_cdb.h
index 6b7ab4fcdf0b079234ba5f488a70c2b8ea1d60af..d6a8034d6be51576fcf1191cd9502217a3672fea 100644 (file)
--- a/libatalk/cnid/cdb/cnid_cdb.h
+++ b/libatalk/cnid/cdb/cnid_cdb.h
@@ -6,7 +6,6 @@
 #ifndef _ATALK_CNID_CDB__H
 #define _ATALK_CNID_CDB__H 1
 
-#include <sys/cdefs.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <string.h>

diff --git a/libatalk/cnid/cdb/cnid_cdb_private.h b/libatalk/cnid/cdb/cnid_cdb_private.h
index 1373f5cb01d4f273b46e60d5c95e8922edbfbbc9..9d65e44682360b8618b2aaadf885999998ee08da 100644 (file)
--- a/libatalk/cnid/cdb/cnid_cdb_private.h
+++ b/libatalk/cnid/cdb/cnid_cdb_private.h
@@ -1,7 +1,3 @@
-/*
- * $Id: cnid_cdb_private.h,v 1.7 2009-11-20 17:22:11 didg Exp $
- */
-
 #ifndef LIBATALK_CDB_PRIVATE_H
 #define LIBATALK_CDB_PRIVATE_H 1
 
@@ -11,24 +7,15 @@
 
 #include <netatalk/endian.h>
 
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif /* HAVE_UNISTD_H */
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
-#endif /* HAVE_FCNTL_H */
 #include <sys/param.h>
 #include <sys/stat.h>
-#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
-#endif /* HAVE_SYS_TIME_H */
-#ifdef HAVE_TIME_H
 #include <time.h>
-#endif
-#include <sys/cdefs.h>
 #include <db.h>
 
 #include <atalk/logger.h>

diff --git a/libatalk/cnid/dbd/cnid_dbd.c b/libatalk/cnid/dbd/cnid_dbd.c
index ab5a20f267af0850e979cbf5c10dc9afc66a1813..e9d29fbbb26bbf06374f318a1282225eada1d2b8 100644 (file)
--- a/libatalk/cnid/dbd/cnid_dbd.c
+++ b/libatalk/cnid/dbd/cnid_dbd.c
@@ -11,15 +11,8 @@
 #ifdef CNID_BACKEND_DBD
 
 #include <stdlib.h>
-#ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
-#endif /* HAVE_SYS_STAT_H */
-#ifdef HAVE_SYS_UIO_H
 #include <sys/uio.h>
-#endif /* HAVE_SYS_UIO_H */
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
 #include <sys/time.h>
 #include <sys/un.h>
 #include <sys/socket.h>

diff --git a/libatalk/cnid/dbd/cnid_dbd.h b/libatalk/cnid/dbd/cnid_dbd.h
index be8659d6cdfdac596019d661d8a73e3cd3549460..2f7e34c902551d97cba366ffa9c605556860aa07 100644 (file)
--- a/libatalk/cnid/dbd/cnid_dbd.h
+++ b/libatalk/cnid/dbd/cnid_dbd.h
@@ -8,7 +8,6 @@
 #ifndef _ATALK_CNID_DBD__H
 #define _ATALK_CNID_DBD__H 1
 
-#include <sys/cdefs.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <string.h>

diff --git a/libatalk/cnid/last/cnid_last.h b/libatalk/cnid/last/cnid_last.h
index 9f944dda51f82f679a37a354e1a3f96bdbf1ebfb..ede35d479c49d7c777ca04e7f2c2a1b3d7830cb9 100644 (file)
--- a/libatalk/cnid/last/cnid_last.h
+++ b/libatalk/cnid/last/cnid_last.h
@@ -1,4 +1,3 @@
-
 /* 
  * interface for database access to cnids. i do it this way to abstract
  * things a bit in case we want to change the underlying implementation.
@@ -7,7 +6,6 @@
 #ifndef _ATALK_CNID_LAST__H
 #define _ATALK_CNID_LAST__H 1
 
-#include <sys/cdefs.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <string.h>

diff --git a/libatalk/cnid/tdb/cnid_tdb.h b/libatalk/cnid/tdb/cnid_tdb.h
index 0bf978a587501a382b968fada89a9d640a8e0288..7e70102c5188520d4f30a78e1eb98a1bd7d5948c 100644 (file)
--- a/libatalk/cnid/tdb/cnid_tdb.h
+++ b/libatalk/cnid/tdb/cnid_tdb.h
@@ -6,7 +6,6 @@
 #ifndef _ATALK_CNID_TDB__H
 #define _ATALK_CNID_TDB__H 1
 
-#include <sys/cdefs.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <string.h>

diff --git a/libatalk/dsi/dsi_getsess.c b/libatalk/dsi/dsi_getsess.c
index bde7318f28a6e7baa86d5868a3aa5ca03f6c5ffd..fc2f06def28a4441b49f624bc1e33ea234283323 100644 (file)
--- a/libatalk/dsi/dsi_getsess.c
+++ b/libatalk/dsi/dsi_getsess.c
@@ -13,23 +13,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif /* HAVE_UNISTD_H */
 #include <signal.h>
 
-/* POSIX.1 sys/wait.h check */
 #include <sys/types.h>
-#ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>
-#endif /* HAVE_SYS_WAIT_H */
-#ifndef WEXITSTATUS
-#define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
-#endif /* ! WEXITSTATUS */
-#ifndef WIFEXITED
-#define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
-#endif /* ! WIFEXITED */
-
 #include <sys/time.h>
 #include <atalk/logger.h>
 #include <atalk/util.h>

diff --git a/libatalk/dsi/dsi_private.h b/libatalk/dsi/dsi_private.h
index 8872f8f3cf8b4a5f09972cc764c37974f063a0e7..ad3169ee5657f1d7d3344fc7529309dc3a529485 100644 (file)
--- a/libatalk/dsi/dsi_private.h
+++ b/libatalk/dsi/dsi_private.h
@@ -1,6 +1,4 @@
 /*
- * $Id: dsi_private.h,v 1.4 2009-11-05 14:38:08 franklahm Exp $
- *
  * Copyright (c) 1997 Adrian Sun (asun@zoology.washington.edu)
  * All rights reserved. See COPYRIGHT.
  */
@@ -13,7 +11,6 @@
  * include it.
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <netatalk/endian.h>
 

diff --git a/libatalk/dsi/dsi_read.c b/libatalk/dsi/dsi_read.c
index 55345ba868738d20ee798ab5ce58e33f1bd69934..cd85f8a08dab8aaca7bcdebe96e17b66025bc9e6 100644 (file)
--- a/libatalk/dsi/dsi_read.c
+++ b/libatalk/dsi/dsi_read.c
@@ -1,6 +1,4 @@
 /*
- * $Id: dsi_read.c,v 1.7 2009-10-25 06:13:11 didg Exp $
- *
  * Copyright (c) 1997 Adrian Sun (asun@zoology.washington.edu)
  * All rights reserved. See COPYRIGHT.
  */
@@ -11,15 +9,10 @@
 
 #include <stdio.h>
 #include <string.h>
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif /* HAVE_UNISTD_H */
 #include <signal.h>
 #include <sys/types.h>
 #include <sys/time.h>
-#ifdef HAVE_SYS_FILIO_H
-#include <sys/filio.h>
-#endif
 
 #include <atalk/dsi.h>
 

diff --git a/libatalk/dsi/dsi_tcp.c b/libatalk/dsi/dsi_tcp.c
index 9c44116a8494944fa15a96346c4b31e02ab9d6de..8b3f979b56ba0900fdfcf838454ab14a9243785a 100644 (file)
--- a/libatalk/dsi/dsi_tcp.c
+++ b/libatalk/dsi/dsi_tcp.c
@@ -1,6 +1,4 @@
 /*
- * $Id: dsi_tcp.c,v 1.25 2009-12-08 22:34:37 didg Exp $
- *
  * Copyright (c) 1997, 1998 Adrian Sun (asun@zoology.washington.edu)
  * All rights reserved. See COPYRIGHT.
  *
@@ -17,9 +15,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif /* HAVE_UNISTD_H */
 #include <errno.h>
 #ifdef HAVE_NETDB_H
 #include <netdb.h>
@@ -27,10 +23,7 @@
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/socket.h>
-
-#ifdef HAVE_STDINT_H
 #include <stdint.h>
-#endif /* HAVE_STDINT_H */
 
 #include <sys/ioctl.h>
 #ifdef TRU64

diff --git a/libatalk/dsi/dsi_write.c b/libatalk/dsi/dsi_write.c
index 79d03caf9491175267e75cd6be1edd55869c9064..84a6e9e602c00d3f594c88757960f81d06cdccd3 100644 (file)
--- a/libatalk/dsi/dsi_write.c
+++ b/libatalk/dsi/dsi_write.c
@@ -13,15 +13,11 @@
 
 /* this streams writes */
 #include <stdio.h>
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif /* HAVE_UNISTD_H */
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/time.h>
-#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
-#endif /* HAVE_FCNTL_H */
 #include <string.h>
 
 #include <atalk/dsi.h>

diff --git a/libatalk/util/getiface.c b/libatalk/util/getiface.c
index 05af80b1d0b35cea7432f9ce38a5c69ec6c2237b..bf79fff7f49e62f63983583aeb0b2b7cb4934d0c 100644 (file)
--- a/libatalk/util/getiface.c
+++ b/libatalk/util/getiface.c
@@ -11,11 +11,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-
-#ifdef HAVE_STDINT_H
 #include <stdint.h>
-#endif
-
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>

diff --git a/libatalk/util/server_child.c b/libatalk/util/server_child.c
index b21bae35f08fe427b4f1f8eed027f0420cb2dd57..beaec9f533b8d3b992eb6a163ad633e3f52a0a2f 100644 (file)
--- a/libatalk/util/server_child.c
+++ b/libatalk/util/server_child.c
@@ -20,35 +20,13 @@
 
 #include <stdlib.h>
 #include <string.h>
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif /* HAVE_UNISTD_H */
 #include <signal.h>
-#include <atalk/logger.h>
-
-/* POSIX.1 sys/wait.h check */
 #include <sys/types.h>
-#ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>
-#endif /* HAVE_SYS_WAIT_H */
 #include <sys/time.h>
 
-#ifndef WEXITSTATUS
-#define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
-#endif /* ! WEXITSTATUS */
-#ifndef WIFEXITED
-#define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
-#endif /* ! WIFEXITED */
-#ifndef WIFSTOPPED
-#define WIFSTOPPED(status) (((status) & 0xff) == 0x7f)
-#endif
-#ifndef WIFSIGNALED
-#define WIFSIGNALED(status) (!WIFSTOPPED(status) && !WIFEXITED(status)) 
-#endif
-#ifndef WTERMSIG
-#define WTERMSIG(status)      ((status) & 0x7f)
-#endif
-
+#include <atalk/logger.h>
 #include <atalk/server_child.h>
 
 /* hash/child functions: hash OR's pid */

diff --git a/libatalk/util/volinfo.c b/libatalk/util/volinfo.c
index 6dec61a0ccf4f817d91d9128be7629ea2469a6bf..ef7847a301d532be049798cf875f895258962713 100644 (file)
--- a/libatalk/util/volinfo.c
+++ b/libatalk/util/volinfo.c
@@ -27,12 +27,7 @@
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#ifdef STDC_HEADERS
 #include <string.h>
-#endif
 #include <sys/param.h>
 
 #include <atalk/adouble.h>

diff --git a/sys/Makefile.am b/sys/Makefile.am
index 4472c8fae48a377dfce3691e157fbdd3a67ff2c7..00cea2aa54f52c190d3e040d7292e3b693cdc2d6 100644 (file)
--- a/sys/Makefile.am
+++ b/sys/Makefile.am
@@ -1,3 +1,3 @@
 # Makefile.am for sys/
 
-SUBDIRS = netatalk generic solaris netbsd sunos ultrix
+SUBDIRS = netatalk solaris netbsd sunos ultrix

diff --git a/sys/generic/.gitignore b/sys/generic/.gitignore
deleted file mode 100644 (file)
index 895a5e7..0000000
--- a/sys/generic/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-.gitignore
-*.o

diff --git a/sys/generic/Makefile.am b/sys/generic/Makefile.am
deleted file mode 100644 (file)
index 081839c..0000000
--- a/sys/generic/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = sys

diff --git a/sys/generic/sys/.gitignore b/sys/generic/sys/.gitignore
deleted file mode 100644 (file)
index 895a5e7..0000000
--- a/sys/generic/sys/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-.gitignore
-*.o

diff --git a/sys/generic/sys/Makefile.am b/sys/generic/sys/Makefile.am
deleted file mode 100644 (file)
index 187947d..0000000
--- a/sys/generic/sys/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST = cdefs.h

diff --git a/sys/generic/sys/cdefs.h b/sys/generic/sys/cdefs.h
deleted file mode 100644 (file)
index c24481c..0000000
--- a/sys/generic/sys/cdefs.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * $Id: cdefs.h,v 1.4 2001-08-15 15:29:14 srittau Exp $
- */
-
-#ifndef _SYS_CDEFS_H
-#define _SYS_CDEFS_H 1
-
-#if defined(__STDC__) || defined(__DECC)
-/* Note that there must be exactly one space between __P(args) and args,
- * otherwise DEC C chokes.
- */
-#define __P(args) args
-#else /* __STDC__ */
-#define __P(args)    ()
-#endif /* __STDC__ */
-
-#endif /* sys/cdefs.h */