aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Fandrich <dan@coneharvesters.com>2008-11-28 23:12:11 +0000
committerDan Fandrich <dan@coneharvesters.com>2008-11-28 23:12:11 +0000
commitbc165078a264b1eb17d20c0370365dad3670bdae (patch)
tree3d3df7c04be0ebd67b3d8968a62f734a94b7df87
parente4dabef0c77cd07b96dad4a3af226acdc6f5f682 (diff)
Don't tweak the HAVE_* macros when using autoconf
-rw-r--r--ares/setup.h28
1 files changed, 12 insertions, 16 deletions
diff --git a/ares/setup.h b/ares/setup.h
index 5a8b2fa6a..585d504f6 100644
--- a/ares/setup.h
+++ b/ares/setup.h
@@ -107,6 +107,18 @@
#define ssize_t int
#endif
+#if !defined(HAVE_SYS_TIME_H) && !defined(_MSC_VER) && !defined(__WATCOMC__)
+#define HAVE_SYS_TIME_H
+#endif
+
+#if !defined(HAVE_UNISTD_H) && !defined(_MSC_VER)
+#define HAVE_UNISTD_H 1
+#endif
+
+#if !defined(HAVE_SYS_UIO_H) && !defined(WIN32) && !defined(MSDOS)
+#define HAVE_SYS_UIO_H
+#endif
+
#endif /* HAVE_CONFIG_H */
/*
@@ -123,22 +135,6 @@
#undef VERSION
#undef PACKAGE
-/*
- * Assume a few thing unless they're set by configure
- */
-
-#if !defined(HAVE_SYS_TIME_H) && !defined(_MSC_VER) && !defined(__WATCOMC__)
-#define HAVE_SYS_TIME_H
-#endif
-
-#if !defined(HAVE_UNISTD_H) && !defined(_MSC_VER)
-#define HAVE_UNISTD_H 1
-#endif
-
-#if !defined(HAVE_SYS_UIO_H) && !defined(WIN32) && !defined(MSDOS)
-#define HAVE_SYS_UIO_H
-#endif
-
/* IPv6 compatibility */
#if !defined(HAVE_AF_INET6)
#if defined(HAVE_PF_INET6)