Import of pkgsrc-2016Q3

databases/sqlrelay/patches/patch-src_api_php_sql__relay.cpp

@@ -1,13 +1,23 @@
-$NetBSD: patch-src_api_php_sql__relay.cpp,v 1.3 2015/07/05 12:52:39 joerg Exp $
+$NetBSD: patch-src_api_php_sql__relay.cpp,v 1.4 2016/07/01 17:02:39 fhajny Exp $
 
---- src/api/php/sql_relay.cpp.orig	2015-07-05 10:40:12.000000000 +0000
+--- src/api/php/sql_relay.cpp.orig	2016-03-13 19:20:25.000000000 +0000
 +++ src/api/php/sql_relay.cpp
-@@ -16,29 +16,7 @@
+@@ -24,39 +24,15 @@
  	#define ZTS 1
  #endif
  
 -extern "C" {
 -	#ifndef WIN32
+-
+-		// On some platforms (solaris), stdio.h must be included prior
+-		// to including math.h or FILE will get redefined.
+-		#include <stdio.h>
+-
+-		// php.h ultimately includes math.h and on some platforms,
+-		// __cplusplus to be defined when including it.  Manually
+-		// including it prior to including php.h solves this problem.
+-		#include <math.h>
+-
 -		#ifdef __cplusplus
 -			#undef __cplusplus
 -			#define cpluspluswasdefined
@@ -29,6 +39,14 @@ $NetBSD: patch-src_api_php_sql__relay.cpp,v 1.3 2015/07/05 12:52:39 joerg Exp $
 -		#endif
 -	#endif
 -}
++// On some platforms (solaris), stdio.h must be included prior
++// to including math.h or FILE will get redefined.
++#include <stdio.h>
++
++// php.h ultimately includes math.h and on some platforms,
++// __cplusplus to be defined when including it.  Manually
++// including it prior to including php.h solves this problem.
++#include <math.h>
 +#include <php.h>
  
  #include <config.h>