[pkgsrc/trunk]: pkgsrc/databases/sqlrelay Don't pretend that C++ is C.

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c4ade8e004cf
branches:  trunk
changeset: 641767:c4ade8e004cf
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Nov 17 19:00:39 2014 +0000

description:
Don't pretend that C++ is C.

diffstat:

 databases/sqlrelay/distinfo                                 |   3 +-
 databases/sqlrelay/patches/patch-src_api_php_sql__relay.cpp |  48 +++++++++++++
 2 files changed, 50 insertions(+), 1 deletions(-)

diffs (67 lines):

diff -r 9caa045ddcac -r c4ade8e004cf databases/sqlrelay/distinfo
--- a/databases/sqlrelay/distinfo       Mon Nov 17 11:54:42 2014 +0000
+++ b/databases/sqlrelay/distinfo       Mon Nov 17 19:00:39 2014 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2014/10/30 11:51:34 fhajny Exp $
+$NetBSD: distinfo,v 1.13 2014/11/17 19:00:39 joerg Exp $
 
 SHA1 (sqlrelay-0.57.tar.gz) = 537733e01beb5374688f2da9642024704bc93580
 RMD160 (sqlrelay-0.57.tar.gz) = 709de60d7be64ab3d98df64a78bad3f110e9562e
@@ -7,4 +7,5 @@
 SHA1 (patch-configure) = 72175a91d2892d5325ec619f45a5b2f571bcdbf5
 SHA1 (patch-etc_Makefile) = 262968ad43d34d53b4fe65514c1351127660e12c
 SHA1 (patch-init_rc.sqlrelay.in) = 6d358d9396339ecee8ef3b7054750100433fb271
+SHA1 (patch-src_api_php_sql__relay.cpp) = 6634d30035473a932c5e5a4a78a0573a0a879ed7
 SHA1 (patch-src_loggers_custom__sc.cpp) = 79e2b0a54b151e76175f549747e3392accd0b4d9
diff -r 9caa045ddcac -r c4ade8e004cf databases/sqlrelay/patches/patch-src_api_php_sql__relay.cpp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/sqlrelay/patches/patch-src_api_php_sql__relay.cpp       Mon Nov 17 19:00:39 2014 +0000
@@ -0,0 +1,48 @@
+$NetBSD: patch-src_api_php_sql__relay.cpp,v 1.1 2014/11/17 19:00:39 joerg Exp $
+
+Don't mess with system headers by pretending to be C or removing defines.
+Just expect php.h to work.
+
+--- src/api/php/sql_relay.cpp.orig     2014-09-02 01:51:20.000000000 +0000
++++ src/api/php/sql_relay.cpp
+@@ -3,39 +3,7 @@
+ 
+ #include <sqlrelay/sqlrclient.h>
+ 
+-#ifdef WIN32
+-      #undef uid_t
+-      #undef gid_t
+-      #undef ssize_t
+-      #undef socklen_t
+-      #undef pid_t
+-      #undef mode_t
+-      #define PHP_WIN32
+-      #define ZEND_WIN32
+-      #define ZEND_DEBUG 0
+-      #define ZTS 1
+-#endif
+-
+-extern "C" {
+-      #ifndef WIN32
+-              #ifdef __cplusplus
+-                      #undef __cplusplus
+-                      #define cpluspluswasdefined
+-              #endif
+-              #ifndef HAVE_SOCKLEN_T
+-                      #define HAVE_SOCKLEN_T
+-              #endif
+-              #ifndef _WCHAR_T_DEFINED_
+-                      #define _WCHAR_T_DEFINED_
+-              #endif
+-      #endif
+-      #include <php.h>
+-      #ifndef WIN32
+-              #ifdef cpluspluswasdefined
+-                      #define __cplusplus
+-              #endif
+-      #endif
+-}
++#include <php.h>
+ 
+ #include <config.h>
+