summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Alburquerque <jaalburqu@svn.gnome.org>2011-06-07 15:50:17 -0400
committerJosé Alburquerque <jaalburqu@svn.gnome.org>2011-06-07 15:54:43 -0400
commit26529018517c845628a2b510198337cfaac55ac0 (patch)
treea60db469c2b8fcc0616db33a44823930b78a701e
parent5212ec63cc25b7350b349a2e435ee1e8000bf7f8 (diff)
downloadglibmm-26529018517c845628a2b510198337cfaac55ac0.tar.gz
M4 Macros: Rename the _INITIALIZER macro to _INITIALIZATION.
* tools/m4/convert_base.m4 (_INITIALIZER): Rename the macro to _INITIALIZATION to be more consistent with the _CONVERSION macro.
-rw-r--r--ChangeLog7
-rw-r--r--tools/m4/convert_base.m48
2 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 331a1206..e78a7968 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2011-06-07 José Alburquerque <jaalburqu@svn.gnome.org>
+ M4 Macros: Rename the _INITIALIZER macro to _INITIALIZATION.
+
+ * tools/m4/convert_base.m4 (_INITIALIZER): Rename the macro to
+ _INITIALIZATION to be more consistent with the _CONVERSION macro.
+
+2011-06-07 José Alburquerque <jaalburqu@svn.gnome.org>
+
gmmproc: _WRAP_METHOD: Add the possibility of an output parameter.
* tools/pm/Output.pm (output_wrap_meth): Modified to test if there is
diff --git a/tools/m4/convert_base.m4 b/tools/m4/convert_base.m4
index c5786a3e..81d87857 100644
--- a/tools/m4/convert_base.m4
+++ b/tools/m4/convert_base.m4
@@ -39,10 +39,10 @@ m4_ifelse(`$3',,,`define(CF`'__HASH2(`$1',`$2'),`$3')')
# _INITIALIZE(target_type, fromtype, output_param_name, c_return, wrap_line)
# Print an initialize statement from ctype to cpptype
define(`_INITIALIZE',`dnl
-m4_ifelse(`$2',void,`$4',`dnl
+m4_ifelse(`$1',void,`$4',`dnl
pushdef(`__INI',`IN`'__HASH2(`$1',`$2')')dnl
m4_ifdef(__INI,`m4_indir(__INI,`$1',`$2',`$3', `$4')',`
-m4_errprint(`No initializer for type $1 from type $2 defined (line: $5, output param: $3, c return: $4)
+m4_errprint(`No initialization for type $1 from type $2 defined (line: $5, output param: $3, c return: $4)
')
m4_m4exit(1)
')`'dnl
@@ -50,9 +50,9 @@ m4_m4exit(1)
')
#
-# Functions for populating initializer tables.
+# Functions for populating initialization tables.
#
-define(`_INITIALIZER',`
+define(`_INITIALIZATION',`
m4_ifelse(`$3',,,`define(IN`'__HASH2(`$1',`$2'),`$3')')
')