diff options
| author | Kjell Ahlstedt <kjell.ahlstedt@bredband.net> | 2013-04-29 09:19:53 +0200 |
|---|---|---|
| committer | Kjell Ahlstedt <kjell.ahlstedt@bredband.net> | 2013-04-29 09:19:53 +0200 |
| commit | cd18cbff8b3679ae6fe3429fb7119251241521fe (patch) | |
| tree | 457f037d362d1db759e58287b659bd1eaea69957 | |
| parent | c99706f217ebad78f17f8f5b9067cd8e4ab4831f (diff) | |
| download | glibmm-cd18cbff8b3679ae6fe3429fb7119251241521fe.tar.gz | |
gmmproc: Fix _WRAP_SIGNAL(custom_c_callback) for void func().
* tools/m4/signal.m4: If custom_c_callback is specified, and the signal
handler takes no arguments and returns void, generate a SignalProxyInfo
structure with pointers to local functions instead of
&Glib::SignalProxyNormal::slot0_void_callback. Bug #605728.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | tools/m4/signal.m4 | 5 |
2 files changed, 12 insertions, 2 deletions
@@ -1,3 +1,12 @@ +2013-04-29 Kjell Ahlstedt <kjell.ahlstedt@bredband.net> + + gmmproc: Fix _WRAP_SIGNAL(custom_c_callback) for void func(). + + * tools/m4/signal.m4: If custom_c_callback is specified, and the signal + handler takes no arguments and returns void, generate a SignalProxyInfo + structure with pointers to local functions instead of + &Glib::SignalProxyNormal::slot0_void_callback. Bug #605728. + 2013-04-25 José Alburquerque <jaalburquerque@gmail.com> Interface: Add a comment about overriding properties in constructor. diff --git a/tools/m4/signal.m4 b/tools/m4/signal.m4 index f9802eb1..bb487ea9 100644 --- a/tools/m4/signal.m4 +++ b/tools/m4/signal.m4 @@ -34,9 +34,10 @@ ifelse(`$11',,,`#ifdef $11' ifelse(`$9',,,`_DEPRECATE_IFDEF_START ')dnl dnl -ifelse($2`'_NUM($3)`'$5`'_NUM($6),`void0void0',`dnl +ifelse($2`'_NUM($3)`'$5`'_NUM($6)`'$8,`void0void00',`dnl dnl -dnl Use predefined callback for SignalProxy0<void>, to reduce code size. +dnl Use predefined callback for SignalProxy0<void>, to reduce code size, +dnl if custom_c_callback is not specified. static const Glib::SignalProxyInfo __CPPNAME__`'_signal_$4_info = { |