cvs: php-gtk /ext/gtk+ php_gtk+.h php_gtk+_types.c /generator templates.php /main php_gtk.h

From: Date: Mon, 16 Jul 2001 21:17:59 +0000
Subject: cvs: php-gtk /ext/gtk+ php_gtk+.h php_gtk+_types.c /generator templates.php /main php_gtk.h
Groups: php.gtk 
Request: Send a blank email to php-gtk+get-2227@lists.php.net to get a copy of this message
andrei Mon Jul 16 17:17:59 2001 EDT Modified files: /php-gtk/ext/gtk+ php_gtk+.h php_gtk+_types.c /php-gtk/generator templates.php /php-gtk/main php_gtk.h Log: Try to fix compilation problem for at least one person. Index: php-gtk/ext/gtk+/php_gtk+.h diff -u php-gtk/ext/gtk+/php_gtk+.h:1.3 php-gtk/ext/gtk+/php_gtk+.h:1.4 --- php-gtk/ext/gtk+/php_gtk+.h:1.3 Tue Jul 10 17:09:36 2001 +++ php-gtk/ext/gtk+/php_gtk+.h Mon Jul 16 17:17:59 2001 @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: php_gtk+.h,v 1.3 2001/07/10 21:09:36 fmk Exp $: */ +/* $Id: php_gtk+.h,v 1.4 2001/07/16 21:17:59 andrei Exp $: */ #ifndef _PHP_GTK_PLUS_H #define _PHP_GTK_PLUS_H @@ -61,25 +61,25 @@ #define PHP_GTK_ACCEL_GROUP_GET(w) PHP_GTK_GET_GENERIC(w, GtkAccelGroup*, le_gtk_accel_group) #define PHP_GTK_STYLE_GET(w) PHP_GTK_GET_GENERIC(w, GtkStyle*, le_gtk_style) -extern PHP_GTK_EXPORT_CE(gdk_event_ce) -extern PHP_GTK_EXPORT_CE(gdk_window_ce) -extern PHP_GTK_EXPORT_CE(gdk_pixmap_ce) -extern PHP_GTK_EXPORT_CE(gdk_bitmap_ce) -extern PHP_GTK_EXPORT_CE(gdk_color_ce) -extern PHP_GTK_EXPORT_CE(gdk_colormap_ce) -extern PHP_GTK_EXPORT_CE(gdk_atom_ce) -extern PHP_GTK_EXPORT_CE(gdk_cursor_ce) -extern PHP_GTK_EXPORT_CE(gdk_visual_ce) -extern PHP_GTK_EXPORT_CE(gdk_font_ce) -extern PHP_GTK_EXPORT_CE(gdk_gc_ce) -extern PHP_GTK_EXPORT_CE(gdk_drag_context_ce) -extern PHP_GTK_EXPORT_CE(gtk_selection_data_ce) -extern PHP_GTK_EXPORT_CE(gtk_ctree_node_ce) -extern PHP_GTK_EXPORT_CE(gtk_accel_group_ce) -extern PHP_GTK_EXPORT_CE(gtk_style_ce) -extern PHP_GTK_EXPORT_CE(gtk_box_child_ce) -extern PHP_GTK_EXPORT_CE(gtk_fixed_child_ce) -extern PHP_GTK_EXPORT_CE(gtk_clist_row_ce) +extern PHP_GTK_EXPORT_CE(gdk_event_ce); +extern PHP_GTK_EXPORT_CE(gdk_window_ce); +extern PHP_GTK_EXPORT_CE(gdk_pixmap_ce); +extern PHP_GTK_EXPORT_CE(gdk_bitmap_ce); +extern PHP_GTK_EXPORT_CE(gdk_color_ce); +extern PHP_GTK_EXPORT_CE(gdk_colormap_ce); +extern PHP_GTK_EXPORT_CE(gdk_atom_ce); +extern PHP_GTK_EXPORT_CE(gdk_cursor_ce); +extern PHP_GTK_EXPORT_CE(gdk_visual_ce); +extern PHP_GTK_EXPORT_CE(gdk_font_ce); +extern PHP_GTK_EXPORT_CE(gdk_gc_ce); +extern PHP_GTK_EXPORT_CE(gdk_drag_context_ce); +extern PHP_GTK_EXPORT_CE(gtk_selection_data_ce); +extern PHP_GTK_EXPORT_CE(gtk_ctree_node_ce); +extern PHP_GTK_EXPORT_CE(gtk_accel_group_ce); +extern PHP_GTK_EXPORT_CE(gtk_style_ce); +extern PHP_GTK_EXPORT_CE(gtk_box_child_ce); +extern PHP_GTK_EXPORT_CE(gtk_fixed_child_ce); +extern PHP_GTK_EXPORT_CE(gtk_clist_row_ce); #include "gen_ce_gtk.h" Index: php-gtk/ext/gtk+/php_gtk+_types.c diff -u php-gtk/ext/gtk+/php_gtk+_types.c:1.2 php-gtk/ext/gtk+/php_gtk+_types.c:1.3 --- php-gtk/ext/gtk+/php_gtk+_types.c:1.2 Tue Jul 10 14:27:50 2001 +++ php-gtk/ext/gtk+/php_gtk+_types.c Mon Jul 16 17:17:59 2001 @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: php_gtk+_types.c,v 1.2 2001/07/10 18:27:50 andrei Exp $ */ +/* $Id: php_gtk+_types.c,v 1.3 2001/07/16 21:17:59 andrei Exp $ */ #include "php_gtk.h" @@ -40,26 +40,26 @@ int le_gtk_accel_group; int le_gtk_style; -PHP_GTK_EXPORT_CE(gdk_event_ce) -PHP_GTK_EXPORT_CE(gdk_window_ce) -PHP_GTK_EXPORT_CE(gdk_pixmap_ce) -PHP_GTK_EXPORT_CE(gdk_bitmap_ce) -PHP_GTK_EXPORT_CE(gdk_color_ce) -PHP_GTK_EXPORT_CE(gdk_colormap_ce) -PHP_GTK_EXPORT_CE(gdk_atom_ce) -PHP_GTK_EXPORT_CE(gdk_cursor_ce) -PHP_GTK_EXPORT_CE(gdk_visual_ce) -PHP_GTK_EXPORT_CE(gdk_font_ce) -PHP_GTK_EXPORT_CE(gdk_gc_ce) -PHP_GTK_EXPORT_CE(gdk_drag_context_ce) -PHP_GTK_EXPORT_CE(gtk_selection_data_ce) -PHP_GTK_EXPORT_CE(gtk_ctree_node_ce) -PHP_GTK_EXPORT_CE(gtk_accel_group_ce) -PHP_GTK_EXPORT_CE(gtk_style_ce) -PHP_GTK_EXPORT_CE(gtk_box_child_ce) -PHP_GTK_EXPORT_CE(gtk_fixed_child_ce) -PHP_GTK_EXPORT_CE(gtk_clist_row_ce) - +PHP_GTK_EXPORT_CE(gdk_event_ce); +PHP_GTK_EXPORT_CE(gdk_window_ce); +PHP_GTK_EXPORT_CE(gdk_pixmap_ce); +PHP_GTK_EXPORT_CE(gdk_bitmap_ce); +PHP_GTK_EXPORT_CE(gdk_color_ce); +PHP_GTK_EXPORT_CE(gdk_colormap_ce); +PHP_GTK_EXPORT_CE(gdk_atom_ce); +PHP_GTK_EXPORT_CE(gdk_cursor_ce); +PHP_GTK_EXPORT_CE(gdk_visual_ce); +PHP_GTK_EXPORT_CE(gdk_font_ce); +PHP_GTK_EXPORT_CE(gdk_gc_ce); +PHP_GTK_EXPORT_CE(gdk_drag_context_ce); +PHP_GTK_EXPORT_CE(gtk_selection_data_ce); +PHP_GTK_EXPORT_CE(gtk_ctree_node_ce); +PHP_GTK_EXPORT_CE(gtk_accel_group_ce); +PHP_GTK_EXPORT_CE(gtk_style_ce); +PHP_GTK_EXPORT_CE(gtk_box_child_ce); +PHP_GTK_EXPORT_CE(gtk_fixed_child_ce); +PHP_GTK_EXPORT_CE(gtk_clist_row_ce); +; /* GdkEvent */ static function_entry php_gdk_event_functions[] = { {"gdkevent", PHP_FN(wrap_no_direct_constructor), NULL}, Index: php-gtk/generator/templates.php diff -u php-gtk/generator/templates.php:1.12 php-gtk/generator/templates.php:1.13 --- php-gtk/generator/templates.php:1.12 Tue Jul 10 14:27:51 2001 +++ php-gtk/generator/templates.php Mon Jul 16 17:17:59 2001 @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: templates.php,v 1.12 2001/07/10 18:27:51 andrei Exp $ */ +/* $Id: templates.php,v 1.13 2001/07/16 21:17:59 andrei Exp $ */ $function_tpl = " PHP_FUNCTION(wrap_%s) @@ -111,6 +111,6 @@ $register_class_tpl = "\t%s = zend_register_internal_class_ex(&ce, %s, NULL);\n"; -$class_entry_tpl = "PHP_GTK_EXPORT_CE(%s)\n"; +$class_entry_tpl = "PHP_GTK_EXPORT_CE(%s);\n"; ?> Index: php-gtk/main/php_gtk.h diff -u php-gtk/main/php_gtk.h:1.43 php-gtk/main/php_gtk.h:1.44 --- php-gtk/main/php_gtk.h:1.43 Tue Jul 10 16:55:44 2001 +++ php-gtk/main/php_gtk.h Mon Jul 16 17:17:59 2001 @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: php_gtk.h,v 1.43 2001/07/10 20:55:44 andrei Exp $: */ +/* $Id: php_gtk.h,v 1.44 2001/07/16 21:17:59 andrei Exp $: */ #ifndef _PHP_GTK_H #define _PHP_GTK_H @@ -27,7 +27,7 @@ #if HAVE_PHP_GTK -#define PHP_GTK_EXPORT_CE(ce) zend_class_entry *ce; +#define PHP_GTK_EXPORT_CE(ce) zend_class_entry *ce #define PHP_GTK_GET_GENERIC(w, type, le) ((type)php_gtk_get_object(w, le)) #undef PG_ERROR

« previous php.gtk (#2227) next »