cvs: php-gtk /generator arg_types.php

[email protected] ("Frank M. Kromann") Tue, 07 Aug 2001 20:27:33 -0000
Newsgroups php.gtk
Message-ID <cvsfmk997216053@cvsserver>
fmk		Tue Aug  7 16:27:33 2001 EDT

  Modified files:              
    /php-gtk/generator	arg_types.php 
  Log:
  Fix for crash in ctree under windows,
  This was a problem with the UTF-8 stuff on windows.
  
Index: php-gtk/generator/arg_types.php
diff -u php-gtk/generator/arg_types.php:1.27 php-gtk/generator/arg_types.php:1.28
--- php-gtk/generator/arg_types.php:1.27	Tue Jul 31 17:12:32 2001
+++ php-gtk/generator/arg_types.php	Tue Aug  7 16:27:33 2001
@@ -19,7 +19,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* $Id: arg_types.php,v 1.27 2001/07/31 21:12:32 andrei Exp $ */
+/* $Id: arg_types.php,v 1.28 2001/08/07 20:27:33 fmk Exp $ */
 
 /*======================================================================*\
 	Function: convert_typename
@@ -119,10 +119,10 @@
 		$parse_list[] 	= '&' . $name;
 
 		if (strtoupper(substr(PHP_OS, 0,3) == "WIN")) {
-			$var_list->add('gchar', '*utf8_' . $name);
+			$var_list->add('gchar', '*utf8_' . $name . ' = NULL');
 			$arg_list[]   = 'utf8_' . $name;
-			$extra_post_code[]   = "\tg_free(utf8_$name);\n";
-			$extra_pre_code[] = "\tutf8_$name = g_convert($name, strlen($name), \"UTF-8\", \"CP1252\", NULL, NULL, NULL);\n";
+			$extra_post_code[]   = "\tif (utf8_$name) g_free(utf8_$name);\n";
+			$extra_pre_code[] = "\tif ($name) utf8_$name = g_convert($name, strlen($name), \"UTF-8\", \"CP1252\", NULL, NULL, NULL);\n";
 		} else
 			$arg_list[] = $name;