From: Brian Aker <brian@tangent.org>
Date: Tue, 15 Jan 2013 23:14:48 +0000 (-0800)
Subject: Fixes for scanner/parser from OSX.
X-Git-Tag: 1.0.16~7^2
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=48e6e1b70b3b79f79334bdea8bfbbb76d377be07;p=m6w6%2Flibmemcached

Fixes for scanner/parser from OSX.
---

diff --git a/libmemcached/csl/common.h b/libmemcached/csl/common.h
index 325d36fe..60b27d6e 100644
--- a/libmemcached/csl/common.h
+++ b/libmemcached/csl/common.h
@@ -37,6 +37,16 @@
 
 #pragma once
 
+
+#ifndef YY_EXTRA_TYPE
+# define YY_EXTRA_TYPE Context*
+#endif
+
+#ifndef YY_TYPEDEF_YY_SCANNER_T
+# define YY_TYPEDEF_YY_SCANNER_T
+typedef void* yyscan_t;
+#endif
+
 #include <libmemcached/common.h>
 #include <libmemcached/csl/server.h>
 
diff --git a/libmemcached/csl/scanner.l b/libmemcached/csl/scanner.l
index e35008a8..4bb5c30c 100644
--- a/libmemcached/csl/scanner.l
+++ b/libmemcached/csl/scanner.l
@@ -61,8 +61,6 @@
 #endif
 #endif
 
-#define YY_EXTRA_TYPE Context*
-
 }
 
 
diff --git a/libtest/cmdline.cc b/libtest/cmdline.cc
index 5e723350..c8b63eec 100644
--- a/libtest/cmdline.cc
+++ b/libtest/cmdline.cc
@@ -595,11 +595,12 @@ void Application::Pipe::reset()
   _open[1]= true;
 
 #if defined(HAVE_PIPE2) && HAVE_PIPE2
+  return;
+#endif
   {
     nonblock();
     cloexec();
   }
-#endif
 }
 
 void Application::Pipe::cloexec()
diff --git a/libtest/result.cc b/libtest/result.cc
index 1cf615b1..ae37e8d2 100644
--- a/libtest/result.cc
+++ b/libtest/result.cc
@@ -38,6 +38,10 @@
 #include <libtest/common.h>
 #include <cstdarg>
 
+#ifndef __INTEL_COMPILER
+# pragma GCC diagnostic ignored "-Wformat-nonliteral"
+#endif
+
 namespace libtest {
 
 __test_result::__test_result(const char *file_arg, int line_arg, const char *func_arg):
diff --git a/man/include.am b/man/include.am
index 3b68557a..512edc40 100644
--- a/man/include.am
+++ b/man/include.am
@@ -15,6 +15,7 @@ BUILT_SOURCES+= $(dist_man_MANS)
 endif
 endif
 
+if HAVE_RECENT_SPHINX
 dist_man_MANS+= man/memaslap.1
 dist_man_MANS+= man/memcapable.1
 dist_man_MANS+= man/memcat.1
@@ -133,3 +134,4 @@ dist_man_MANS+= man/memcached_touch.3
 dist_man_MANS+= man/memcached_touch_by_key.3
 dist_man_MANS+= man/memcached_verbosity.3
 dist_man_MANS+= man/memcached_version.3
+endif