Update for OSX build issues.

diff --git a/libmemcached-1.0/memcached.h b/libmemcached-1.0/memcached.h
index fa9661528002e9f3712ace1f0679065d678c9213..23462a760bf97f672571d20fb873d0a0be60af0e 100644 (file)
--- a/libmemcached-1.0/memcached.h
+++ b/libmemcached-1.0/memcached.h
@@ -38,7 +38,9 @@
 #pragma once
 
 /* This seems to be required for older compilers @note http://stackoverflow.com/questions/8132399/how-to-printf-uint64-t  */
-#define __STDC_FORMAT_MACROS
+#ifndef __STDC_FORMAT_MACROS
+#  define __STDC_FORMAT_MACROS
+#endif
 
 #ifdef __cplusplus
 #  include <tr1/cinttypes>

diff --git a/libtest/include.am b/libtest/include.am
index 7e9be22da54672e5814bb197dc304a9bbec4ab4a..a0d5aa040433df53672dfa09521dfd2c89ee3e8c 100644 (file)
--- a/libtest/include.am
+++ b/libtest/include.am
@@ -113,7 +113,6 @@ libtest_libtest_la_SOURCES+= libtest/server.cc
 libtest_libtest_la_SOURCES+= libtest/server_container.cc 
 libtest_libtest_la_SOURCES+= libtest/signal.cc 
 libtest_libtest_la_SOURCES+= libtest/socket.cc 
-libtest_libtest_la_SOURCES+= libtest/stream.cc 
 libtest_libtest_la_SOURCES+= libtest/strerror.cc 
 libtest_libtest_la_SOURCES+= libtest/timer.cc 
 libtest_libtest_la_SOURCES+= libtest/tmpfile.cc 

diff --git a/libtest/stream.cc b/libtest/stream.cc
deleted file mode 100644 (file)
index a9d769f..0000000
--- a/libtest/stream.cc
+++ /dev/null
@@ -1,64 +0,0 @@
-/*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- *  Data Differential YATL (i.e. libtest)  library
- *
- *  Copyright (C) 2012 Data Differential, http://datadifferential.com/
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are
- *  met:
- *
- *      * Redistributions of source code must retain the above copyright
- *  notice, this list of conditions and the following disclaimer.
- *
- *      * Redistributions in binary form must reproduce the above
- *  copyright notice, this list of conditions and the following disclaimer
- *  in the documentation and/or other materials provided with the
- *  distribution.
- *
- *      * The names of its contributors may not be used to endorse or
- *  promote products derived from this software without specific prior
- *  written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#include <config.h>
-#include <libtest/stream.h>
-
-namespace libtest {
-namespace stream {
-
-namespace detail {
-
-} // namespace detail
-
-make_cerr::make_cerr(const char* filename, int line_number, const char* func) :
-  log(std::cerr, filename, line_number, func)
-{ }
-
-cerr::cerr(const char* filename, int line_number, const char* func) :
-  log(std::cout, filename, line_number, func)
-  { }
-
-clog::clog(const char* filename, int line_number, const char* func) :
-  log(std::clog, filename, line_number, func)
-  { }
-
-cout::cout(const char* filename, int line_number, const char* func) :
-  log(std::cout, filename, line_number, func)
-  { }
-
-} // namespace stream
-} // namespace libtest

diff --git a/libtest/stream.h b/libtest/stream.h
index 9917b94df253ed0ae103e834bf0e0ae26e7f3040..a32362f28977110fd25ba49e679547f03a6039a1 100644 (file)
--- a/libtest/stream.h
+++ b/libtest/stream.h
@@ -150,22 +150,30 @@ template<template <class Ch, class Tr, class A> class OutputPolicy, class Ch = c
 
 class make_cerr : public detail::log<detail::channelln> {
 public:
-  make_cerr(const char* filename, int line_number, const char* func);
+  make_cerr(const char* filename, int line_number, const char* func) :
+    detail::log<detail::channelln>(std::cerr, filename, line_number, func)
+  { }
 };
 
 class cerr : public detail::log<detail::channel> {
 public:
-  cerr(const char* filename, int line_number, const char* func);
+  cerr(const char* filename, int line_number, const char* func) :
+    detail::log<detail::channel>(std::cout, filename, line_number, func)
+  { }
 };
 
 class clog : public detail::log<detail::channel> {
 public:
-  clog(const char* filename, int line_number, const char* func);
+  clog(const char* filename, int line_number, const char* func) :
+    detail::log<detail::channel>(std::clog, filename, line_number, func)
+  { }
 };
 
 class cout : public detail::log<detail::channel> {
 public:
-  cout(const char* filename, int line_number, const char* func);
+  cout(const char* filename, int line_number, const char* func) :
+    detail::log<detail::channel>(std::cout, filename, line_number, func)
+  { }
 };
 
 

diff --git a/m4/bottom.m4 b/m4/bottom.m4
index 303aaf7a6cc7d614c0088362f4a85ddbeb5333fc..a772e05945054718d2d1f8a1db8f2cc927e6277f 100644 (file)
--- a/m4/bottom.m4
+++ b/m4/bottom.m4
@@ -12,7 +12,9 @@ AH_TOP([
 
 AH_BOTTOM([
 
-#define __STDC_FORMAT_MACROS
+#ifndef __STDC_FORMAT_MACROS
+#  define __STDC_FORMAT_MACROS
+#endif
  
 #if defined(__cplusplus) 
 #  include CINTTYPES_H