From 5161acdd240c220cbb07887e9a17069ef93380ba Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Tue, 13 Apr 2021 09:07:31 +1200
Subject: [PATCH] Eliminate direct reference to c_result in typemap

Typemaps should use $result.
---
 Lib/php/php.swg | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Lib/php/php.swg b/Lib/php/php.swg
index 793082241..ebbfadf18 100644
--- a/Lib/php/php.swg
+++ b/Lib/php/php.swg
@@ -101,13 +101,12 @@
   if (!EG(exception)) {
     if ($needNewFlow) {
       tmp = ($&1_ltype) &SWIG_Z_FETCH_OBJ_P(result)->ptr;
-      c_result = *tmp;
       SWIG_Z_FETCH_OBJ_P(result)->newobject = 0;
     } else {
       if (SWIG_ConvertPtr($input, (void **) &tmp, $&1_descriptor, 0) < 0 || tmp == NULL)
         SWIG_PHP_Error(E_ERROR, "Type error in argument $argnum of $symname. Expected $&1_descriptor");
-      $result = *tmp;
     }
+    $result = *tmp;
   }
 %}