Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29210
Modified Files: Tag: desiredata m_pd.h desire.h desire.c d_ugen.c m_fifo.h Log Message: removed EXTERN_STRUCT
Index: m_fifo.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/m_fifo.h,v retrieving revision 1.1.2.3.2.1 retrieving revision 1.1.2.3.2.1.2.1 diff -C2 -d -r1.1.2.3.2.1 -r1.1.2.3.2.1.2.1 *** m_fifo.h 22 Dec 2005 00:43:40 -0000 1.1.2.3.2.1 --- m_fifo.h 20 Dec 2006 10:10:37 -0000 1.1.2.3.2.1.2.1 *************** *** 7,12 ****
/* used data structures */ ! EXTERN_STRUCT _fifo; ! #define t_fifo struct _fifo
/* function prototypes */ --- 7,11 ----
/* used data structures */ ! typedef struct _fifo t_fifo;
/* function prototypes */
Index: m_pd.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v retrieving revision 1.4.4.11.2.33.2.18 retrieving revision 1.4.4.11.2.33.2.19 diff -C2 -d -r1.4.4.11.2.33.2.18 -r1.4.4.11.2.33.2.19 *** m_pd.h 20 Dec 2006 09:58:39 -0000 1.4.4.11.2.33.2.18 --- m_pd.h 20 Dec 2006 10:10:34 -0000 1.4.4.11.2.33.2.19 *************** *** 43,55 **** #endif /* MSW */
- /* and depending on the compiler, hidden data structures are - declared differently: */ - #if defined( __GNUC__) || defined( __BORLANDC__ ) || defined( __MWERKS__ ) - #define EXTERN_STRUCT struct - #else - #define EXTERN_STRUCT extern struct - #endif - - #if !defined(_SIZE_T) && !defined(_SIZE_T_) #include <stddef.h> /* just for size_t -- how lame! */ --- 43,46 ---- *************** *** 66,82 **** typedef float t_floatarg; /* floating-point type for function calls */
! EXTERN_STRUCT _class; ! #define t_class struct _class ! EXTERN_STRUCT _outlet; ! #define t_outlet struct _outlet ! EXTERN_STRUCT _inlet; ! #define t_inlet struct _inlet ! EXTERN_STRUCT _binbuf; ! #define t_binbuf struct _binbuf ! EXTERN_STRUCT _clock; ! #define t_clock struct _clock ! EXTERN_STRUCT _glist; ! #define t_glist struct _glist ! #define t_canvas struct _glist
#ifdef PD_PLUSPLUS_FACE --- 57,66 ---- typedef float t_floatarg; /* floating-point type for function calls */
! typedef struct _class t_class; ! typedef struct _outlet t_outlet; ! typedef struct _inlet t_inlet; ! typedef struct _binbuf t_binbuf; ! typedef struct _clock t_clock; ! typedef struct _glist t_glist, t_canvas;
#ifdef PD_PLUSPLUS_FACE *************** *** 103,108 **** } t_string;
! EXTERN_STRUCT _array; ! #define t_array struct _array /* g_canvas.h */
/* pointers to glist and array elements go through a "stub" which sticks --- 87,91 ---- } t_string;
! typedef struct _array t_array; /* g_canvas.h */
/* pointers to glist and array elements go through a "stub" which sticks *************** *** 161,166 **** } t_atom;
! EXTERN_STRUCT _hash; ! #define t_hash struct _hash typedef void *hashkey; typedef void *hashvalue; --- 144,148 ---- } t_atom;
! typedef struct _hash t_hash; typedef void *hashkey; typedef void *hashvalue; *************** *** 226,231 **** } t_outconnect; #else ! EXTERN_STRUCT _outconnect; ! #define t_outconnect struct _outconnect #endif
--- 208,212 ---- } t_outconnect; #else ! typedef struct _outconnect t_outconnect; #endif
*************** *** 518,522 **** EXTERN void class_setfieldnames(t_class *x, const char *s); /* where s is split on spaces and tokenized */ EXTERN int class_getfieldindex(t_class *x, const char *s); - typedef int (*t_loader)(t_canvas *canvas, char *classname); EXTERN void sys_register_loader(t_loader loader); --- 499,502 ---- *************** *** 537,541 **** EXTERN void sys_ouch(void);
- /* ------------ system interface routines ------------------- */ EXTERN int sys_isreadablefile(const char *name); --- 517,520 ---- *************** *** 550,563 **** /* ------------ threading ------------------- */ /* T.Grill - see m_sched.c */ - EXTERN void sys_lock(void); EXTERN void sys_unlock(void); EXTERN int sys_trylock(void); EXTERN int sys_timedlock(int microsec); - /* tb: to be called at idle time */ EXTERN void sys_callback(t_int (*callback) (t_int* argv), t_int* argv, t_int argc);
- /* --------------- signals ----------------------------------- */
--- 529,539 ---- *************** *** 747,753 **** /* --------------------- data --------------------------------- */
! /* graphical arrays */ ! EXTERN_STRUCT _garray; ! #define t_garray struct _garray
EXTERN t_class *garray_class; --- 723,728 ---- /* --------------------- data --------------------------------- */
! /* graphical arrays */ ! typedef struct _garray t_garray;
EXTERN t_class *garray_class; *************** *** 760,764 **** EXTERN void garray_usedindsp(t_garray *x); EXTERN void garray_setsaveit(t_garray *x, int saveit); - EXTERN double garray_updatetime(t_garray *x);
--- 735,738 ----
Index: d_ugen.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/d_ugen.c,v retrieving revision 1.3.4.1.2.5.2.3 retrieving revision 1.3.4.1.2.5.2.4 diff -C2 -d -r1.3.4.1.2.5.2.3 -r1.3.4.1.2.5.2.4 *** d_ugen.c 20 Dec 2006 08:19:27 -0000 1.3.4.1.2.5.2.3 --- d_ugen.c 20 Dec 2006 10:10:37 -0000 1.3.4.1.2.5.2.4 *************** *** 34,39 **** static t_int *dsp_chain; static int dsp_chainsize; ! EXTERN_STRUCT _vinlet; ! EXTERN_STRUCT _voutlet;
void vinlet_dspprolog(struct _vinlet *x, t_signal **parentsigs, --- 34,39 ---- static t_int *dsp_chain; static int dsp_chainsize; ! struct _vinlet; ! struct _voutlet;
void vinlet_dspprolog(struct _vinlet *x, t_signal **parentsigs,
Index: desire.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.h,v retrieving revision 1.1.2.49.2.12 retrieving revision 1.1.2.49.2.13 diff -C2 -d -r1.1.2.49.2.12 -r1.1.2.49.2.13 *** desire.h 14 Dec 2006 02:07:48 -0000 1.1.2.49.2.12 --- desire.h 20 Dec 2006 10:10:34 -0000 1.1.2.49.2.13 *************** *** 69,74 **** t_pd *pd_new3(const char *s);
! struct _class ! { t_symbol *c_name; /* name (mostly for error reporting) */ t_symbol *c_helpname; /* name of help file */ --- 69,73 ---- t_pd *pd_new3(const char *s);
! struct _class { t_symbol *c_name; /* name (mostly for error reporting) */ t_symbol *c_helpname; /* name of help file */ *************** *** 123,136 **** #endif
- EXTERN_STRUCT t_gtemplate; typedef struct t_gtemplate t_gtemplate; ! EXTERN_STRUCT _guiconnect; ! #define t_guiconnect struct _guiconnect ! EXTERN_STRUCT _tscalar; ! #define t_tscalar struct _tscalar ! EXTERN_STRUCT _canvasenvironment; ! #define t_canvasenvironment struct _canvasenvironment ! EXTERN_STRUCT _slot; ! #define t_slot struct _slot
/* the t_tick structure describes where to draw x and y "ticks" for a canvas */ --- 122,128 ---- #endif
typedef struct t_gtemplate t_gtemplate; ! typedef struct _canvasenvironment t_canvasenvironment; ! typedef struct _slot t_slot;
/* the t_tick structure describes where to draw x and y "ticks" for a canvas */
Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.217.2.90 retrieving revision 1.1.2.217.2.91 diff -C2 -d -r1.1.2.217.2.90 -r1.1.2.217.2.91 *** desire.c 20 Dec 2006 05:26:37 -0000 1.1.2.217.2.90 --- desire.c 20 Dec 2006 10:10:35 -0000 1.1.2.217.2.91 *************** *** 950,955 **** /* ------------------------- DSP chain handling ------------------------- */
! EXTERN_STRUCT _dspcontext; ! #define t_dspcontext struct _dspcontext
extern "C" void ugen_start(void); --- 950,954 ---- /* ------------------------- DSP chain handling ------------------------- */
! typedef struct _dspcontext t_dspcontext;
extern "C" void ugen_start(void);