pd/src m_conf.c,1.1.1.3.12.2,1.1.1.3.12.3 - Pd-cvs

8 Sep 2005


      Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6884
Modified Files:
      Tag: devel_0_39
    m_conf.c 
Log Message:
fixing a problem with msvc on tgrill's request
Index: m_conf.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/m_conf.c,v
retrieving revision 1.1.1.3.12.2
retrieving revision 1.1.1.3.12.3
diff -C2 -d -r1.1.1.3.12.2 -r1.1.1.3.12.3
*** m_conf.c	8 Sep 2005 07:54:36 -0000	1.1.1.3.12.2
--- m_conf.c	8 Sep 2005 20:46:29 -0000	1.1.1.3.12.3
***************
*** 8,34 ****
  #include "m_pd.h"
! #define S(name) void name##_setup(void); name##_setup();
! void conf_init(void)
! {
!     S(g_array) S(g_canvas) S(g_guiconnect)
  #ifdef DESIRE
      S(desire)
  #else
      S(g_bang) S(g_hradio) S(g_hslider) S(g_mycanvas) S(g_numbox)
!     S(g_toggle) S(g_vradio) S(g_vslider) S(g_vumeter)
!     S(g_text)
  #endif
!     S(g_io)
!     S(g_scalar)
!     S(g_template)
!     S(g_traversal)
!     S(m_pd)
!     S(x_acoustics) S(x_interface) S(x_connective)
!     S(x_time) S(x_arithmetic) S(x_midi)
!     S(x_misc) S(x_net) S(x_qlist) S(x_gui) S(x_list)
!     S(d_arithmetic) S(d_array) S(d_ctl) S(d_dac)
      S(d_delay) S(d_fft) S(d_filter) S(d_global)
      S(d_math) S(d_misc) S(d_osc) S(d_soundfile) S(d_ugen)
- }
--- 8,43 ----
  #include "m_pd.h"
! /* tgrill told me that msvc doesn't like decls interspersed
!    with statements within a func. d'oh.
! */
! #define S(name) void name##_setup(void);
  #ifdef DESIRE
      S(desire)
  #else
      S(g_bang) S(g_hradio) S(g_hslider) S(g_mycanvas) S(g_numbox)
!     S(g_toggle) S(g_vradio) S(g_vslider) S(g_vumeter) S(g_text)
  #endif
!     S(g_array) S(g_canvas) S(g_guiconnect) S(g_io) S(g_scalar) S(g_template)
!     S(g_traversal) S(m_pd) S(x_acoustics) S(x_interface) S(x_connective)
!     S(x_time) S(x_arithmetic) S(x_midi) S(x_misc) S(x_net) S(x_qlist)
!     S(x_gui) S(x_list) S(d_arithmetic) S(d_array) S(d_ctl) S(d_dac)
      S(d_delay) S(d_fft) S(d_filter) S(d_global)
      S(d_math) S(d_misc) S(d_osc) S(d_soundfile) S(d_ugen)
+ #undef S
+ #define S(name) name##_setup();
+ void conf_init(void) {
+ #ifdef DESIRE
+     S(desire)
+ #else
+     S(g_bang) S(g_hradio) S(g_hslider) S(g_mycanvas) S(g_numbox)
+     S(g_toggle) S(g_vradio) S(g_vslider) S(g_vumeter) S(g_text)
+ #endif
+     S(g_array) S(g_canvas) S(g_guiconnect) S(g_io) S(g_scalar) S(g_template)
+     S(g_traversal) S(m_pd) S(x_acoustics) S(x_interface) S(x_connective)
+     S(x_time) S(x_arithmetic) S(x_midi) S(x_misc) S(x_net) S(x_qlist)
+     S(x_gui) S(x_list) S(d_arithmetic) S(d_array) S(d_ctl) S(d_dac)
+     S(d_delay) S(d_fft) S(d_filter) S(d_global)
+     S(d_math) S(d_misc) S(d_osc) S(d_soundfile) S(d_ugen)
+ }