Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 6 Nov 2020 11:25:53 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r554224 - head/graphics/php-geos/files
Message-ID:  <202011061125.0A6BPrZQ095204@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sunpoet
Date: Fri Nov  6 11:25:53 2020
New Revision: 554224
URL: https://svnweb.freebsd.org/changeset/ports/554224

Log:
  Fix build with PHP 8.0

Modified:
  head/graphics/php-geos/files/patch-geos.c

Modified: head/graphics/php-geos/files/patch-geos.c
==============================================================================
--- head/graphics/php-geos/files/patch-geos.c	Fri Nov  6 11:25:47 2020	(r554223)
+++ head/graphics/php-geos/files/patch-geos.c	Fri Nov  6 11:25:53 2020	(r554224)
@@ -1,6 +1,20 @@
 --- geos.c.orig	2016-12-24 10:53:24 UTC
 +++ geos.c
-@@ -863,7 +863,7 @@ PHP_METHOD(Geometry, buffer)
+@@ -33,6 +33,13 @@
+ /* Own stuff */
+ #include "php_geos.h"
+ 
++#if PHP_MAJOR_VERSION >= 8
++#define TSRMLS_C
++#define TSRMLS_CC
++#define TSRMLS_DC
++#define TSRMLS_FETCH()
++#endif
++
+ static ZEND_DECLARE_MODULE_GLOBALS(geos);
+ static PHP_GINIT_FUNCTION(geos);
+ 
+@@ -863,7 +870,7 @@ PHP_METHOD(Geometry, buffer)
      GEOS_PHP_ZVAL data;
      HashTable *style;
      zend_string *key;
@@ -9,7 +23,7 @@
  
      this = (GEOSGeometry*)getRelay(getThis(), Geometry_ce_ptr);
  
-@@ -956,7 +956,7 @@ PHP_METHOD(Geometry, offsetCurve)
+@@ -956,7 +963,7 @@ PHP_METHOD(Geometry, offsetCurve)
      GEOS_PHP_ZVAL data;
      HashTable *style;
      zend_string *key;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202011061125.0A6BPrZQ095204>