[glibmm] gmmproc: Remove M4 warnings due to commas in return types.

[Josà Alburquerque <jaalburqu src gnome org>]

commit 570314de2e0ff7635847695ec546d501817fb878
Author: Josà Alburquerque <jaalburqu svn gnome org>
Date:   Sun Oct 16 23:47:35 2011 -0400

    gmmproc: Remove M4 warnings due to commas in return types.
    
    	* tools/m4/convert_base.m4 (__HASH2): Appropriately quote the
    	pushdef() arguments and the m4_ifelse() arguments due to some warnings
    	generated because of the newly wrapped method in the
    	ApplicationCommandLine class (get_platform_data()) which has a comma
    	in the return type.  The wrapping was successful even with the warning
    	but the return type was still being split when passed to this macro.

 ChangeLog                |   11 +++++++++++
 tools/m4/convert_base.m4 |    4 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index fade3f8..e905684 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2011-10-16  Josà Alburquerque  <jaalburqu svn gnome org>
+
+	gmmproc: Remove M4 warnings due to commas in return types.
+
+	* tools/m4/convert_base.m4 (__HASH2): Appropriately quote the
+	pushdef() arguments and the m4_ifelse() arguments due to some warnings
+	generated because of the newly wrapped method in the
+	ApplicationCommandLine class (get_platform_data()) which has a comma
+	in the return type.  The wrapping was successful even with the warning
+	but the return type was still being split when passed to this macro.
+
 2011-10-13  Josà Alburquerque  <jaalburqu svn gnome org>
 
 	Gio::DBus::Connection: Correct UnixFDList class forward declaration.
diff --git a/tools/m4/convert_base.m4 b/tools/m4/convert_base.m4
index eb07c1e..cf95b48 100644
--- a/tools/m4/convert_base.m4
+++ b/tools/m4/convert_base.m4
@@ -7,8 +7,8 @@ define(`__HASH',`__`'m4_translit(`$*',`ABCDEFGHIJKLMNOPQRSTUVWXYZ<>[]&*, ',`abcd
 define(`__EQUIV',`m4_ifdef(EV`'__HASH(`$1'),EV`'__HASH(`$1'),`$1')')
 
 define(`__HASH2',`dnl
-pushdef(`__E1',__EQUIV(`$1'))pushdef(`__E2',__EQUIV(`$2'))dnl
-m4_ifelse(__E1,__E2,`__EQ',__HASH(__E1)`'__HASH(__E2))`'dnl
+pushdef(`__E1',`__EQUIV(`$1')')pushdef(`__E2',`__EQUIV(`$2')')dnl
+m4_ifelse(_QUOTE(__E1),_QUOTE(__E2),`__EQ',__HASH(__E1)`'__HASH(__E2))`'dnl
 popdef(`__E1')popdef(`__E2')`'')
 
 define(`CF__EQ',`$3')