summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Ebourne <martin@ebourne.me.uk>2005-12-21 00:43:31 +0000
committerMartin Ebourne <martin@ebourne.me.uk>2005-12-21 00:43:31 +0000
commit2a8fa1955bef6a50b192a196f53e47f8b9852acb (patch)
tree9df4204f691aa91382242f82eb98ae83d2ee6cf0
parentf732f2a0982c6c14adedcdc5702b1c85add171ac (diff)
Rename config.h to BoxConfig.h to help prevent clashes
-rw-r--r--configure.ac2
-rw-r--r--lib/common/BoxPlatform.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index e978f673..42cce8c1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
AC_PREREQ(2.59)
AC_INIT([Box Backup], 0.09, [box@fluffy.co.uk])
AC_CONFIG_SRCDIR([lib/common/Box.h])
-AC_CONFIG_HEADERS([lib/common/config.h])
+AC_CONFIG_HEADERS([lib/common/BoxConfig.h])
touch install-sh
AC_CANONICAL_SYSTEM
diff --git a/lib/common/BoxPlatform.h b/lib/common/BoxPlatform.h
index 55065796..9906b33c 100644
--- a/lib/common/BoxPlatform.h
+++ b/lib/common/BoxPlatform.h
@@ -21,7 +21,7 @@
#define PLATFORM_DEV_NULL "/dev/null"
-#include "config.h"
+#include "BoxConfig.h"
#ifdef WIN32
// need msvcrt version 6.1 or higher for _gmtime64()