Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29035
Modified Files: Tag: devel_0_39 desire.c m_hash.c Log Message: DesireData goes C++. In this step, we make structs inherit from each other and remove some casts obsoleted by this.
Index: m_hash.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/m_hash.c,v retrieving revision 1.1.2.10 retrieving revision 1.1.2.11 diff -C2 -d -r1.1.2.10 -r1.1.2.11 *** m_hash.c 19 Nov 2006 05:58:24 -0000 1.1.2.10 --- m_hash.c 23 Nov 2006 04:18:08 -0000 1.1.2.11 *************** *** 104,108 **** }
! void hash_setup (void) { hash_class = class_new(gensym("#V"), (t_newmethod)0 /*hash_new*/, (t_method)hash_free, sizeof(t_object), CLASS_PD, A_GIMME, 0); --- 104,108 ---- }
! extern "C" void hash_setup (void) { hash_class = class_new(gensym("#V"), (t_newmethod)0 /*hash_new*/, (t_method)hash_free, sizeof(t_object), CLASS_PD, A_GIMME, 0);
Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.195 retrieving revision 1.1.2.196 diff -C2 -d -r1.1.2.195 -r1.1.2.196 *** desire.c 21 Nov 2006 06:47:59 -0000 1.1.2.195 --- desire.c 23 Nov 2006 04:18:06 -0000 1.1.2.196 *************** *** 15,32 **** #include "desire.h"
- #ifdef __cplusplus - #define EXTERNC extern "C" - #else - #define EXTERNC extern - #endif - - #ifdef __cplusplus extern "C" { [...1846 lines suppressed...] *************** *** 8083,8087 ****
/* properly close all open root canvases */ ! EXTERNC void glob_closeall(void *dummy, t_floatarg fforce) { t_canvas *x, *y; for (x = canvas_list; x; ) { --- 8046,8050 ----
/* properly close all open root canvases */ ! extern "C" void glob_closeall(void *dummy, t_floatarg fforce) { t_canvas *x, *y; for (x = canvas_list; x; ) { *************** *** 8091,8094 **** } } - - --- 8054,8055 ----