From ad36b6040d85dcd7b2bfb64595a551e4b121178c Mon Sep 17 00:00:00 2001 From: Brian Aker Date: Thu, 10 May 2012 14:42:21 -0700 Subject: [PATCH] Update for OSX build issues. --- libmemcached-1.0/memcached.h | 4 ++- libtest/include.am | 1 - libtest/stream.cc | 64 ------------------------------------ libtest/stream.h | 16 ++++++--- m4/bottom.m4 | 4 ++- 5 files changed, 18 insertions(+), 71 deletions(-) delete mode 100644 libtest/stream.cc diff --git a/libmemcached-1.0/memcached.h b/libmemcached-1.0/memcached.h index fa966152..23462a76 100644 --- 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 diff --git a/libtest/include.am b/libtest/include.am index 7e9be22d..a0d5aa04 100644 --- 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 index a9d769f8..00000000 --- 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 -#include - -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 9917b94d..a32362f2 100644 --- a/libtest/stream.h +++ b/libtest/stream.h @@ -150,22 +150,30 @@ template