com gtk/php-gtk: libglade's _almost_ compiling - some export problems still.: ext/libglade/config.w3 2 ext/libglade/libglade.defs ext/libglade/libglade.ov errides ext/libglade/php_libglade.c ext/libglade/php_ libglade.h

Commit:    133e914ce2d7737dfa12954642aa796e0c20ea7b=0AAuthor:    Steph Fox =
<[email protected]>         Thu, 22 Sep 2005 03:29:16 +0000=0AParents:   585ef8b=
e2ec46a2f16c7d6ae27734f34abcd0537=0ABranches:  master=0A=0ALink:       http=
://git.php.net/?p=3Dgtk/php-gtk.git;a=3Dcommitdiff;h=3D133e914ce2d7737dfa12=
954642aa796e0c20ea7b=0A=0ALog:=0Alibglade's _almost_ compiling - some expor=
t problems still.=0A=0AChanged paths:=0A  M  ext/libglade/config.w32=0A  M =
 ext/libglade/libglade.defs=0A  M  ext/libglade/libglade.overrides=0A  M  e=
xt/libglade/php_libglade.c=0A  M  ext/libglade/php_libglade.h=0A=0A=0ADiff:=
=0A133e914ce2d7737dfa12954642aa796e0c20ea7b=0Adiff --git a/ext/libglade/con=
fig.w32 b/ext/libglade/config.w32=0Aindex 27613c3..ac16895 100644=0A--- a/e=
xt/libglade/config.w32=0A+++ b/ext/libglade/config.w32=0A@@ -5,10 +5,6 @@ i=
f (PHP_GTK_LIBGLADE !=3D "no") {=0A =0A =09if (CHECK_HEADER("glade\\glade.h=
") && CHECK_LIB("glade-2.0.lib", "libglade")) {=0A =0A-=09=09ADD_FLAG("CFLA=
GS_LIBGLADE", "/I ext\\libglade /I ..\\ext\\libglade /D HAVE_LIBGLADE=3D1")=
;=0A-=09=09EXTENSION("libglade", "php_libglade.c gen_libglade.c", true); //=
 always shared=0A-=09=09AC_DEFINE("HAVE_LIBGLADE", 1, "libglade enabled");=
=0A-=0A =09=09if (FSO.FileExists("win32\\temp.bat")) {=0A =0A =09=09=09var =
temp =3D FSO.OpenTextFile("win32\\temp.bat", 8);=0A@@ -18,6 +14,10 @@ if (P=
HP_GTK_LIBGLADE !=3D "no") {=0A =09=09=09temp.WriteLine('grep -h "^PHP_GTK_=
EXPORT_CE" ext\\libglade\\gen_libglade.c | sed -e "s/^/PHP_GTK_API extern /=
" > ext\\libglade\\gen_libglade.h');=0A =09=09}=0A =0A+=09=09ADD_FLAG("CFLA=
GS_LIBGLADE", "/I ext\\libglade /I ..\\ext\\libglade /D HAVE_LIBGLADE=3D1")=
;=0A+=09=09EXTENSION("libglade", "php_libglade.c gen_libglade.c", true); //=
 always shared=0A+=09=09AC_DEFINE("HAVE_LIBGLADE", 1, "libglade enabled");=
=0A+=0A =09} else {=0A =0A =09=09WARNING("libglade not enabled; libraries a=
nd headers not found");=0Adiff --git a/ext/libglade/libglade.defs b/ext/lib=
glade/libglade.defs=0Aindex 673dc4c..84b4839 100644=0A--- a/ext/libglade/li=
bglade.defs=0A+++ b/ext/libglade/libglade.defs=0A@@ -3,7 +3,7 @@=0A =0A (de=
fine-object XML=0A   (in-module "Glade")=0A-  (parent "GtkObject")=0A+  (pa=
rent "GObject")=0A   (c-name "GladeXML")=0A   (gtype-id "GLADE_TYPE_XML")=
=0A )=0Adiff --git a/ext/libglade/libglade.overrides b/ext/libglade/libglad=
e.overrides=0Aindex 43349f0..96803d5 100644=0A--- a/ext/libglade/libglade.o=
verrides=0A+++ b/ext/libglade/libglade.overrides=0A@@ -3,6 +3,7 @@=0A heade=
rs=0A #include <glade/glade.h>=0A #include "ext/gtk+/php_gtk+.h"=0A+#includ=
e "ext/gtk+/gen_gtk.h"=0A %%=0A ignore-glob=0A   *_get_type=0Adiff --git a/=
ext/libglade/php_libglade.c b/ext/libglade/php_libglade.c=0Aindex f725768..=
6a12198 100644=0A--- a/ext/libglade/php_libglade.c=0A+++ b/ext/libglade/php=
_libglade.c=0A@@ -30,6 +30,7 @@ PHP_GTK_GET_EXTENSION(libglade);=0A =0A PHP=
_GTK_XINIT_FUNCTION(libglade)=0A {=0A+=09//php_libglade_register_constants(=
module_number TSRMLS_CC);=0A =09phpg_libglade_register_classes();=0A =09php=
g_libglade_register_constants("GLADE_");=0A =0Adiff --git a/ext/libglade/ph=
p_libglade.h b/ext/libglade/php_libglade.h=0Aindex 418235f..e3cd87a 100644=
=0A--- a/ext/libglade/php_libglade.h=0A+++ b/ext/libglade/php_libglade.h=0A=
@@ -33,13 +33,14 @@=0A extern php_gtk_ext_entry libglade_ext_entry;=0A #def=
ine php_gtk_ext_libglade_ptr &libglade_ext_entry=0A =0A-void phpg_libglade_=
register_constants(const char *strip_prefix);=0A+//void php_libglade_regist=
er_constants(int module_number TSRMLS_DC);=0A void phpg_libglade_register_c=
lasses(void);=0A+void phpg_libglade_register_constants(const char *strip_pr=
efix);=0A =0A #else=0A =0A #define php_gtk_ext_libglade_ptr NULL=0A =0A-#en=
dif /* HAVE_LIBGLADE */=0A+#endif=09/* HAVE_LIBGLADE */=0A =0A-#endif /* PH=
P_LIBGLADE_H */=0A+#endif=09/* PHP_LIBGLADE_H */=0A