From fa3d10953e68379bfc96a86347bd177629f3e8a0 Mon Sep 17 00:00:00 2001 From: musil Date: Wed, 31 Oct 2007 10:46:46 +0000 Subject: win32 fixes svn path=/trunk/externals/zexy/; revision=8915 --- src/freadln.c | 7 ++++--- src/fwriteln.c | 1 + src/matchbox.c | 6 +++++- src/pack~.c | 3 ++- src/zexy.c | 2 ++ src/zexy.dsp | 12 ++++++++++++ src/zexy.h | 4 +++- 7 files changed, 29 insertions(+), 6 deletions(-) diff --git a/src/freadln.c b/src/freadln.c index 02ce2e3..fdad165 100644 --- a/src/freadln.c +++ b/src/freadln.c @@ -26,12 +26,13 @@ //#include //#include -//#ifdef __WIN32__ -//# include +#ifdef __WIN32__ +# include +# include //#else //# include //# include -//#endif +#endif #define MIN_FREADLN_LENGTH 10 diff --git a/src/fwriteln.c b/src/fwriteln.c index 9f54be1..4c1d9fb 100644 --- a/src/fwriteln.c +++ b/src/fwriteln.c @@ -19,6 +19,7 @@ #ifdef __WIN32__ # define snprintf _snprintf +# include #endif #include diff --git a/src/matchbox.c b/src/matchbox.c index 1942248..131fc5c 100644 --- a/src/matchbox.c +++ b/src/matchbox.c @@ -94,10 +94,14 @@ static t_listlist* addlistlist(t_listlist*list, int argc, t_atom*argv) { /* delete the _next_ element from the list */ static t_listlist* deletelistnext(t_listlist*list) { + t_listlist*ll=0; + if(!list || !list->next)return list; /* nothing to delete */ - t_listlist*ll=list->next; + + ll=list->next; list->next=ll->next; if(ll->argv)freebytes(ll->argv, ll->argc*sizeof(t_atom)); + ll->argv=0; ll->argc=0; ll->next=0; diff --git a/src/pack~.c b/src/pack~.c index ab904b0..79c7430 100644 --- a/src/pack~.c +++ b/src/pack~.c @@ -43,8 +43,9 @@ static t_int *sigpack_perform(t_int *w) SETFLOAT(&buf[i], f); i++; } +#ifndef __WIN32__ #warning defer list-output to next block with a clock! - +#endif outlet_list(x->x_obj.ob_outlet, &s_list, x->vector_length, x->buffer); return (w+4); diff --git a/src/zexy.c b/src/zexy.c index 62bc003..94d6779 100644 --- a/src/zexy.c +++ b/src/zexy.c @@ -153,6 +153,7 @@ void zexy_setup(void) z_zexy_setup(); } +#ifndef __WIN32__ void verbose(int level, const char *fmt, ...){ char buf[MAXPDSTRING]; va_list ap; @@ -165,3 +166,4 @@ void verbose(int level, const char *fmt, ...){ post("zverbose(%d): %s", level, buf); } +#endif \ No newline at end of file diff --git a/src/zexy.dsp b/src/zexy.dsp index 4e8f5d6..4542e27 100644 --- a/src/zexy.dsp +++ b/src/zexy.dsp @@ -180,6 +180,10 @@ SOURCE=.\list2int.c # End Source File # Begin Source File +SOURCE=.\list2lists.c +# End Source File +# Begin Source File + SOURCE=.\list2symbol.c # End Source File # Begin Source File @@ -188,6 +192,10 @@ SOURCE=.\lister.c # End Source File # Begin Source File +SOURCE=.\listfind.c +# End Source File +# Begin Source File + SOURCE=.\lpt.c # End Source File # Begin Source File @@ -328,6 +336,10 @@ SOURCE=.\tabminmax.c # End Source File # Begin Source File +SOURCE=.\tabread4~~.c +# End Source File +# Begin Source File + SOURCE=.\tabset.c # End Source File # Begin Source File diff --git a/src/zexy.h b/src/zexy.h index 27f5d7e..d83dfe6 100644 --- a/src/zexy.h +++ b/src/zexy.h @@ -119,7 +119,9 @@ static void zexy_register(char*object){object=0;} * which will chime in, when pd is lacking one * this should make zexy binary compatible with older pd versions again */ -void verbose(int level, const char *fmt, ...); +# ifndef __WIN32__ + void verbose(int level, const char *fmt, ...); +# endif #else /* * on older version we just shut up! -- cgit v1.2.1