Fixed unittests and vc-changelog.

diff --git a/.bzrignore b/.bzrignore
index d7c41d0e32f7cb6052689318e3bbf20bda014f40..0ccaac97bb5290d11e4f8c2c64ab6afa1400c151 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -185,3 +185,4 @@ tests/testhashkit
 tests/testplus
 tests/testudp
 unittests/unittests
+config/top.h

diff --git a/configure.ac b/configure.ac
index 379466df3de0495dcbc6aa0c18acc2526afd9160..8d55fa90c872f01d702e850bced6fa94d4c10a90 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ AC_INIT([libmemcached],[0.44],[http://libmemcached.org/])
 AC_CONFIG_SRCDIR([libmemcached/memcached.c])
 AC_CONFIG_AUX_DIR(config)
 
-PANDORA_CANONICAL_TARGET
+PANDORA_CANONICAL_TARGET(no-vc-changelog)
 
 #shared library versioning
 MEMCACHED_UTIL_LIBRARY_VERSION=1:0:0

diff --git a/unittests/include.am b/unittests/include.am
index 6c2172088f5ea3da309e50ec0b23cdf55900d063..c14434189a9f685eb6307ec887a5b06705961172 100644 (file)
--- a/unittests/include.am
+++ b/unittests/include.am
@@ -10,7 +10,7 @@ unittests_unittests_SOURCES= \
                             unittests/main.cc \
                             unittests/strings.cc
 
-unittests_unittest_CXXFLAGS= ${AM_CXXFLAGS} ${NO_WERROR}
+unittests_unittests_CXXFLAGS= ${AM_CXXFLAGS} ${NO_WERROR} ${NO_EFF_CXX}
 unittests_unittests_LDADD= \
                           tests/libserver.la \
                           libmemcached/libmemcachedinternal.la \

diff --git a/unittests/strings.cc b/unittests/strings.cc
index 921fe8768ca17d9877920caefe215315da9961cb..8728926bd00ed346277794d12fe3fdfe7629f8f0 100644 (file)
--- a/unittests/strings.cc
+++ b/unittests/strings.cc
@@ -8,9 +8,6 @@
 
 #include "config.h"
 
-#define __STDC_LIMIT_MACROS
-#include <stdint.h>
-
 #include <gtest/gtest.h>
 
 #include <libmemcached/common.h>