diff options
| author | joerg <joerg> | 2015-07-05 12:52:39 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2015-07-05 12:52:39 +0000 |
| commit | 34a58be2dfa260b5151d11a13a5f7138ae52a2e8 (patch) | |
| tree | 4eba9f3d5e5f65e1b382793173056263eb552074 /databases/sqlrelay | |
| parent | ead08461dcd59661242f5279403580711d31368a (diff) | |
| download | pkgsrc-34a58be2dfa260b5151d11a13a5f7138ae52a2e8.tar.gz | |
Restore patch for src/api/php/sql_relay.cpp:
Do not pretend that C++ is C.
Diffstat (limited to 'databases/sqlrelay')
| -rw-r--r-- | databases/sqlrelay/distinfo | 3 | ||||
| -rw-r--r-- | databases/sqlrelay/patches/patch-src_api_php_sql__relay.cpp | 35 |
2 files changed, 37 insertions, 1 deletions
diff --git a/databases/sqlrelay/distinfo b/databases/sqlrelay/distinfo index 3055026470f..7f78355ec92 100644 --- a/databases/sqlrelay/distinfo +++ b/databases/sqlrelay/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.14 2015/05/20 13:26:45 ryoon Exp $ +$NetBSD: distinfo,v 1.15 2015/07/05 12:52:39 joerg Exp $ SHA1 (sqlrelay-0.59.tar.gz) = 0d89f1cfff4c929297f92a575bfdae43d0b7affa RMD160 (sqlrelay-0.59.tar.gz) = a0731c80048f280b71ec1dcb89bedad2b5145348 @@ -7,6 +7,7 @@ SHA1 (patch-ad) = cc4a94941ec737abede98bdd7b19bc902f755609 SHA1 (patch-config.mk.in) = 3ac1d68eec9e71b2827a675549dc873be9a56741 SHA1 (patch-configure) = cd7598c42a3d12c3ac4874d07cfe679b3dc24b2c SHA1 (patch-etc_Makefile) = 128102a3eaaeba96425060f82dc8e5e94edeabd0 +SHA1 (patch-src_api_php_sql__relay.cpp) = d589837f05e86d614bc3b71bc0459ae786193d88 SHA1 (patch-src_api_ruby_getcflags.rb) = a08e18e15cf8b7e7aff4b50d3927d7c352ec15c3 SHA1 (patch-src_api_ruby_getsitearchdir.rb) = 89d1bee15077d009a8e9b3b98443dcc667a583da SHA1 (patch-src_loggers_custom__sc.cpp) = 79e2b0a54b151e76175f549747e3392accd0b4d9 diff --git a/databases/sqlrelay/patches/patch-src_api_php_sql__relay.cpp b/databases/sqlrelay/patches/patch-src_api_php_sql__relay.cpp new file mode 100644 index 00000000000..d05d4dba139 --- /dev/null +++ b/databases/sqlrelay/patches/patch-src_api_php_sql__relay.cpp @@ -0,0 +1,35 @@ +$NetBSD: patch-src_api_php_sql__relay.cpp,v 1.3 2015/07/05 12:52:39 joerg Exp $ + +--- src/api/php/sql_relay.cpp.orig 2015-07-05 10:40:12.000000000 +0000 ++++ src/api/php/sql_relay.cpp +@@ -16,29 +16,7 @@ + #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_DECLARED +- #define _WCHAR_T_DECLARED +- #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> + |