From 1ec0417eb52441da155a8487615debfd2f74b9b9 Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Fri, 29 Sep 2006 10:09:23 +0000
Subject: [PATCH] Use SWIGPHP instead of SWIGPHP4

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@9380 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Doc/Manual/Preprocessor.html            | 1 +
 Examples/GIFPlot/Interface/gifplot.i    | 2 +-
 Examples/test-suite/operator_overload.i | 2 +-
 Examples/test-suite/preproc.i           | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Doc/Manual/Preprocessor.html b/Doc/Manual/Preprocessor.html
index f29f8669d..7ccb5bff3 100644
--- a/Doc/Manual/Preprocessor.html
+++ b/Doc/Manual/Preprocessor.html
@@ -118,6 +118,7 @@ SWIGPERL                        Defined when using Perl
 SWIGPERL5                       Defined when using Perl5
 SWIGPHP                         Defined when using PHP
 SWIGPHP4                        Defined when using PHP4
+SWIGPHP5                        Defined when using PHP5
 SWIGPIKE                        Defined when using Pike
 SWIGPYTHON                      Defined when using Python
 SWIGRUBY                        Defined when using Ruby
diff --git a/Examples/GIFPlot/Interface/gifplot.i b/Examples/GIFPlot/Interface/gifplot.i
index 91af2ae24..fdf661c5e 100644
--- a/Examples/GIFPlot/Interface/gifplot.i
+++ b/Examples/GIFPlot/Interface/gifplot.i
@@ -6,7 +6,7 @@
 #include "gifplot.h"
 %}
 
-#if defined(SWIGJAVA ) || defined(SWIGPHP4)
+#if defined(SWIGJAVA ) || defined(SWIGPHP)
   %rename(make_default) ColorMap::default();
 #endif
 
diff --git a/Examples/test-suite/operator_overload.i b/Examples/test-suite/operator_overload.i
index 92eb9669c..6d221be8f 100644
--- a/Examples/test-suite/operator_overload.i
+++ b/Examples/test-suite/operator_overload.i
@@ -66,7 +66,7 @@ see bottom for a set of possible tests
 %}
 #endif
 
-#ifdef SWIGPHP4
+#ifdef SWIGPHP
 %rename(AndOperator) operator &&;
 %rename(OrOperator) operator ||;
 #endif
diff --git a/Examples/test-suite/preproc.i b/Examples/test-suite/preproc.i
index 210365346..0fc0c6199 100644
--- a/Examples/test-suite/preproc.i
+++ b/Examples/test-suite/preproc.i
@@ -287,7 +287,7 @@ inline const char* mangle ## #@__VA_ARGS__ () {
 #ifdef SWIGRUBY
 %rename(ddefined) defined;
 #endif
-#ifdef SWIGPHP4
+#ifdef SWIGPHP
 %rename(endif_) endif;
 #endif
 %inline %{