summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2004-11-14 17:21:32 +0000
committerNick Mathewson <nickm@torproject.org>2004-11-14 17:21:32 +0000
commit783bbcf471622fccc487267db0377adb04d75461 (patch)
treece46433ab967716a60b15a72a9bd4b508d3e7383
parent846f71dccabb7b5385e6498985adde5abad4d4b4 (diff)
downloadtor-783bbcf471622fccc487267db0377adb04d75461.tar.gz
tor-783bbcf471622fccc487267db0377adb04d75461.zip
Fix "implicit declaration of ftello" warning: add AC_FUNC_FSEEKO in configure.in and always include orconfig.h before anything else
svn:r2854
-rw-r--r--configure.in11
-rw-r--r--src/common/aes.c2
-rw-r--r--src/common/log.c2
3 files changed, 7 insertions, 8 deletions
diff --git a/configure.in b/configure.in
index 16a0f38714..fa6dac81fa 100644
--- a/configure.in
+++ b/configure.in
@@ -145,7 +145,8 @@ dnl These headers are not essential
AC_CHECK_HEADERS(stdint.h sys/types.h inttypes.h sys/param.h sys/wait.h sys/limits.h netinet/in.h arpa/inet.h machine/limits.h syslog.h sys/time.h sys/resource.h)
-AC_CHECK_FUNCS(gettimeofday ftime socketpair uname inet_aton strptime getrlimit setrlimit strlcat strlcpy strtoull getpwnam fseeko ftello)
+AC_CHECK_FUNCS(gettimeofday ftime socketpair uname inet_aton strptime getrlimit setrlimit strlcat strlcpy strtoull getpwnam ftello)
+AC_FUNC_FSEEKO
AC_CHECK_MEMBERS([struct timeval.tv_sec])
@@ -236,12 +237,10 @@ AC_SUBST(LOCALSTATEDIR)
# than autoconf's macros like.
CFLAGS="$CFLAGS -Wall -g -O2"
# Add some more warnings which we use in the cvs version but not in the
-# released versions.
-#CFLAGS="$CFLAGS -W -Wno-unused-parameter -Wfloat-equal -Wundef -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes"
-#CFLAGS="$CFLAGS -Wwrite-strings -Wredundant-decls"
-
+# released versions. (Some relevant gcc versions can't handle these.)
+#CFLAGS="$CFLAGS -W -Wno-unused-parameter -Wfloat-equal -Wundef -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wwrite-strings -Wredundant-decls"
# Add these in when you feel like fun.
-# -Wbad-function-cast -Werror -Wdeclaration-after-statement
+#CFLAGS="$CFLAGS -Wbad-function-cast -Werror -Wdeclaration-after-statement"
echo "confdir: $CONFDIR"
diff --git a/src/common/aes.c b/src/common/aes.c
index 45e93a9bef..4d0111e6c7 100644
--- a/src/common/aes.c
+++ b/src/common/aes.c
@@ -8,10 +8,10 @@
* \brief Implementation of a simple AES counter mode.
**/
+#include "orconfig.h"
#include <assert.h>
#include <stdlib.h>
#include <string.h>
-#include "orconfig.h"
#include "aes.h"
#include "util.h"
diff --git a/src/common/log.c b/src/common/log.c
index 49571f64fb..500cfa1c14 100644
--- a/src/common/log.c
+++ b/src/common/log.c
@@ -8,11 +8,11 @@
* \brief Functions to send messages to log files or the console.
*/
+#include "orconfig.h"
#include <stdarg.h>
#include <assert.h>
#include <stdlib.h>
#include <string.h>
-#include "orconfig.h"
#include "./util.h"
#include "./log.h"