diff options
| author | Murray Cumming <murrayc@murrayc.com> | 2011-10-18 17:39:03 +0200 |
|---|---|---|
| committer | Murray Cumming <murrayc@murrayc.com> | 2011-10-18 17:39:03 +0200 |
| commit | d224aa28c9dc395c436f95bffc4a557a57ad0315 (patch) | |
| tree | 4e1cd772e6c8f7549a54a172dd45e6302986b0de | |
| parent | 570314de2e0ff7635847695ec546d501817fb878 (diff) | |
| download | glibmm-d224aa28c9dc395c436f95bffc4a557a57ad0315.tar.gz | |
Revert "gmmproc: Remove M4 warnings due to commas in return types."
This reverts commit 570314de2e0ff7635847695ec546d501817fb878.
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | tools/m4/convert_base.m4 | 4 |
2 files changed, 2 insertions, 13 deletions
@@ -1,14 +1,3 @@ -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 cf95b48c..eb07c1ef 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(_QUOTE(__E1),_QUOTE(__E2),`__EQ',__HASH(__E1)`'__HASH(__E2))`'dnl +pushdef(`__E1',__EQUIV(`$1'))pushdef(`__E2',__EQUIV(`$2'))dnl +m4_ifelse(__E1,__E2,`__EQ',__HASH(__E1)`'__HASH(__E2))`'dnl popdef(`__E1')popdef(`__E2')`'') define(`CF__EQ',`$3') |