From 0307d0732c7c7c682d2b5542475f6171d287f7a2 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Sun, 15 May 2022 18:21:59 +0100
Subject: [PATCH] Typemaps for (int ARGC, char **ARGV) fixup

The default typemap should not be in this library file - this is for
users to add in if they want C default argument support.
---
 Examples/test-suite/argcargvtest.i | 2 ++
 Lib/perl5/argcargv.i               | 4 ----
 Lib/php/argcargv.i                 | 4 ----
 Lib/tcl/argcargv.i                 | 4 ----
 4 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/Examples/test-suite/argcargvtest.i b/Examples/test-suite/argcargvtest.i
index ed5aa0985..d87ce6871 100644
--- a/Examples/test-suite/argcargvtest.i
+++ b/Examples/test-suite/argcargvtest.i
@@ -1,8 +1,10 @@
 %module argcargvtest
 
+#if !defined(SWIGCSHARP) && !defined(SWIGD) && !defined(SWIGGO) && !defined(SWIGGUILE) && !defined(SWIGJAVA) && !defined(SWIGJAVASCRIPT) && !defined(SWIGMZSCHEME) && !defined(SWIGOCTAVE) && !defined(SWIGR) && !defined(SWIGSCILAB)
 %include <argcargv.i>
 
 %apply (int ARGC, char **ARGV) { (size_t argc, const char **argv) }
+#endif
 
 %inline %{
 
diff --git a/Lib/perl5/argcargv.i b/Lib/perl5/argcargv.i
index 5c3968e37..7ab7b66b7 100644
--- a/Lib/perl5/argcargv.i
+++ b/Lib/perl5/argcargv.i
@@ -2,10 +2,6 @@
  * --- Argc & Argv ---
  * ------------------------------------------------------------ */
 
-%typemap(default) (int ARGC, char **ARGV) {
-  $1 = 0; $2 = NULL;
-}
-
 %typemap(in) (int ARGC, char **ARGV) {
   int i;
   I32 len;
diff --git a/Lib/php/argcargv.i b/Lib/php/argcargv.i
index 15a86a942..e5625c2ca 100644
--- a/Lib/php/argcargv.i
+++ b/Lib/php/argcargv.i
@@ -2,10 +2,6 @@
  * --- Argc & Argv ---
  * ------------------------------------------------------------ */
 
-%typemap(default) (int ARGC, char **ARGV) {
-  $1 = 0; $2 = NULL;
-}
-
 %typemap(in) (int ARGC, char **ARGV) {
   int len, i;
   zval *val;
diff --git a/Lib/tcl/argcargv.i b/Lib/tcl/argcargv.i
index bcc3dc8a9..0fb1c8af9 100644
--- a/Lib/tcl/argcargv.i
+++ b/Lib/tcl/argcargv.i
@@ -2,10 +2,6 @@
  * --- Argc & Argv ---
  * ------------------------------------------------------------ */
 
-%typemap(default) (int ARGC, char **ARGV) {
-  $1 = 0; $2 = NULL;
-}
-
 %typemap(in) (int ARGC, char **ARGV) {
   int i, nitems;
   Tcl_Obj **listobjv;