summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMurray Cumming <murrayc@murrayc.com>2005-04-22 07:28:24 +0000
committerMurray Cumming <murrayc@src.gnome.org>2005-04-22 07:28:24 +0000
commita29587a2521fbd0953afa929db675a30f6a7b399 (patch)
treeadac55b039925e5f1f720d2c4e26c37a4b78f073
parenta16f0a4ec7f13f0307d1d996b74a483832cb70eb (diff)
downloadglibmm-a29587a2521fbd0953afa929db675a30f6a7b399.tar.gz
Regenerate with enums.pl Regenerate with h2defs.py This adds the
2005-04-22 Murray Cumming <murrayc@murrayc.com> * glib/src/gmodule_enums.defs: Regenerate with enums.pl * glib/src/gmodule_functions.defs: Regenerate with h2defs.py This adds the BIND_LOCAL enum value. Bug #172748 from Phillip Neiswanger.
-rw-r--r--ChangeLog7
-rw-r--r--glib/src/gmodule_enums.defs5
-rw-r--r--glib/src/gmodule_functions.defs20
3 files changed, 20 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index d5f684ee..da1e84a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-04-22 Murray Cumming <murrayc@murrayc.com>
+
+ * glib/src/gmodule_enums.defs: Regenerate with enums.pl
+ * glib/src/gmodule_functions.defs: Regenerate with h2defs.py
+ This adds the BIND_LOCAL enum value. Bug #172748 from
+ Phillip Neiswanger.
+
2005-04-05 Murray Cumming <murrayc@murrayc.com>
* tool/pm/Output.pm: output_wrap_property(): Do not add the
diff --git a/glib/src/gmodule_enums.defs b/glib/src/gmodule_enums.defs
index ef495330..16b781bd 100644
--- a/glib/src/gmodule_enums.defs
+++ b/glib/src/gmodule_enums.defs
@@ -1,11 +1,12 @@
-;; From gmodule.h
+;; From /home/murrayc/cvs/gnome212/glib/gmodule/gmodule.h
(define-flags-extended ModuleFlags
(in-module "G")
(c-name "GModuleFlags")
(values
'("lazy" "G_MODULE_BIND_LAZY" "1 << 0")
- '("mask" "G_MODULE_BIND_MASK" "0x01")
+ '("local" "G_MODULE_BIND_LOCAL" "1 << 1")
+ '("mask" "G_MODULE_BIND_MASK" "0x03")
)
)
diff --git a/glib/src/gmodule_functions.defs b/glib/src/gmodule_functions.defs
index 6b4d926b..220ab514 100644
--- a/glib/src/gmodule_functions.defs
+++ b/glib/src/gmodule_functions.defs
@@ -2,22 +2,28 @@
; object definitions ...
;; Enumerations and flags ...
-(define-flags ModuleFlags
- (in-module "G")
+(define-flags Flags
+ (in-module "GModule")
(c-name "GModuleFlags")
(gtype-id "G_TYPE_MODULE_FLAGS")
(values
'("lazy" "G_MODULE_BIND_LAZY")
+ '("local" "G_MODULE_BIND_LOCAL")
'("mask" "G_MODULE_BIND_MASK")
)
)
-;; From /gnome/head/cvs/glib/gmodule/gmoduleconf.h
+;; From /home/murrayc/cvs/gnome212/glib/gmodule/gmoduleconf.h
-;; From /gnome/head/cvs/glib/gmodule/gmodule.h
+;; From /home/murrayc/cvs/gnome212/glib/gmodule/gmodule.h
+
+(define-function g_module_supported
+ (c-name "g_module_supported")
+ (return-type "gboolean")
+)
(define-function g_module_open
(c-name "g_module_open")
@@ -70,10 +76,4 @@
)
)
-;; custom-written:
-(define-function g_module_supported
- (c-name "g_module_supported")
- (return-type "gboolean")
-)
-