[PD-cvs] externals/zexy/src date.c, 1.2, 1.3 length.c, 1.2, 1.3 lpt.c, 1.3, 1.4 msgfile.c, 1.3, 1.4 operating_system.c, 1.2, 1.3 sfplay.c, 1.3, 1.4 sfrecord.c, 1.3, 1.4 symbol2list.c, 1.2, 1.3 tavg~.c, 1.2, 1.3 time.c, 1.2, 1.3 z_sigbin.c, 1.3, 1.4 zexy.h, 1.4, 1.5
IOhannes m zmölnig
zmoelnig at users.sourceforge.net
Thu Jun 9 14:17:05 CEST 2005
Update of /cvsroot/pure-data/externals/zexy/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30818
Modified Files:
date.c length.c lpt.c msgfile.c operating_system.c sfplay.c
sfrecord.c symbol2list.c tavg~.c time.c z_sigbin.c zexy.h
Log Message:
replaced MACOSX by __APPLE__
replaced NT by __WIN32__ (defined by mingw, but NOT by msvc)
Index: z_sigbin.c
===================================================================
RCS file: /cvsroot/pure-data/externals/zexy/src/z_sigbin.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** z_sigbin.c 19 May 2005 09:42:55 -0000 1.3
--- z_sigbin.c 9 Jun 2005 12:17:03 -0000 1.4
***************
*** 24,31 ****
#include <math.h>
- #ifdef NT
- #define fabsf fabs
- #endif
-
typedef struct _misc
{
--- 24,27 ----
Index: time.c
===================================================================
RCS file: /cvsroot/pure-data/externals/zexy/src/time.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** time.c 19 May 2005 09:42:55 -0000 1.2
--- time.c 9 Jun 2005 12:17:03 -0000 1.3
***************
*** 23,32 ****
*/
! #ifdef NT
#define USE_TIMEB
#endif
! #ifdef MACOSX
#include <sys/types.h>
/* typedef _BSD_TIME_T_ time_t; */
--- 23,33 ----
*/
+ #include "zexy.h"
! #ifdef __WIN32__
#define USE_TIMEB
#endif
! #ifdef __APPLE__
#include <sys/types.h>
/* typedef _BSD_TIME_T_ time_t; */
***************
*** 34,38 ****
- #include "zexy.h"
#include <time.h>
--- 35,38 ----
Index: date.c
===================================================================
RCS file: /cvsroot/pure-data/externals/zexy/src/date.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** date.c 19 May 2005 09:42:55 -0000 1.2
--- date.c 9 Jun 2005 12:17:03 -0000 1.3
***************
*** 24,32 ****
*/
! #ifdef NT
# define USE_TIMEB
#endif
! #ifdef MACOSX
# include <sys/types.h>
/* typedef _BSD_TIME_T_ time_t; */
--- 24,34 ----
*/
! #include "zexy.h"
!
! #ifdef __WIN32__
# define USE_TIMEB
#endif
! #ifdef __APPLE__
# include <sys/types.h>
/* typedef _BSD_TIME_T_ time_t; */
***************
*** 34,38 ****
- #include "zexy.h"
#include <time.h>
--- 36,39 ----
Index: sfplay.c
===================================================================
RCS file: /cvsroot/pure-data/externals/zexy/src/sfplay.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** sfplay.c 19 May 2005 09:42:55 -0000 1.3
--- sfplay.c 9 Jun 2005 12:17:03 -0000 1.4
***************
*** 66,75 ****
#define DACBLKSIZE 64 /* in m_imp.h, but error if it is included it here*/
- #ifdef NT
- #pragma warning( disable : 4244 )
- #pragma warning( disable : 4305 )
- #pragma warning( disable : 4018 )
- #endif
-
#include <stdio.h>
#include <string.h>
--- 66,69 ----
***************
*** 79,89 ****
#define MAX_CHANS 8 /* channels for soundfiles 1,2,4,8 */
! #ifdef NT
! #define BINREADMODE "rb"
#endif
#ifdef unix
! #include <unistd.h>
! #include <sys/mman.h>
! #define BINREADMODE "r"
#endif
--- 73,83 ----
#define MAX_CHANS 8 /* channels for soundfiles 1,2,4,8 */
! #ifdef __WIN32__
! # define BINREADMODE "rb"
#endif
#ifdef unix
! # include <unistd.h>
! # include <sys/mman.h>
! # define BINREADMODE "r"
#endif
Index: zexy.h
===================================================================
RCS file: /cvsroot/pure-data/externals/zexy/src/zexy.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** zexy.h 12 Apr 2005 12:01:46 -0000 1.4
--- zexy.h 9 Jun 2005 12:17:03 -0000 1.5
***************
*** 31,54 ****
#define INCLUDE_ZEXY_H__
#include "m_pd.h"
#define VERSION "2.0"
! #ifdef NT
# pragma warning( disable : 4244 )
# pragma warning( disable : 4305 )
# define HEARTSYMBOL 3
- # define sqrtf sqrt
- # define fabsf fabs
# define STATIC_INLINE
#else
# define HEARTSYMBOL 169
#endif
! #ifdef MACOSX
# define sqrtf sqrt
#endif
-
typedef struct _mypdlist
{
--- 31,61 ----
#define INCLUDE_ZEXY_H__
+ #ifdef __WIN32__
+ # define NT
+ # define MSW
+ #endif
+
#include "m_pd.h"
#define VERSION "2.0"
!
! #ifdef __WIN32__
! # pragma warning( disable : 4018 )
# pragma warning( disable : 4244 )
# pragma warning( disable : 4305 )
# define HEARTSYMBOL 3
# define STATIC_INLINE
+ //# define sqrtf sqrt
+ //# define fabsf fabs
#else
# define HEARTSYMBOL 169
+ # define STATIC_INLINE static
#endif
! #ifdef __APPLE__
# define sqrtf sqrt
#endif
typedef struct _mypdlist
{
Index: msgfile.c
===================================================================
RCS file: /cvsroot/pure-data/externals/zexy/src/msgfile.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** msgfile.c 8 Jun 2005 17:07:21 -0000 1.3
--- msgfile.c 9 Jun 2005 12:17:03 -0000 1.4
***************
*** 29,33 ****
#include <unistd.h>
#endif
! #ifdef NT
#include <io.h>
#endif
--- 29,33 ----
#include <unistd.h>
#endif
! #ifdef __WIN32__
#include <io.h>
#endif
***************
*** 526,530 ****
! #ifdef NT
rmode |= O_BINARY;
#endif
--- 526,530 ----
! #ifdef __WIN32__
rmode |= O_BINARY;
#endif
Index: sfrecord.c
===================================================================
RCS file: /cvsroot/pure-data/externals/zexy/src/sfrecord.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** sfrecord.c 19 May 2005 09:42:55 -0000 1.3
--- sfrecord.c 9 Jun 2005 12:17:03 -0000 1.4
***************
*** 37,45 ****
#define DACBLKSIZE 64 /* in m_imp.h, but error if it is included it here*/
- #ifdef NT
- #pragma warning( disable : 4244 )
- #pragma warning( disable : 4305 )
- #endif
-
#include <stdio.h>
#include <string.h>
--- 37,40 ----
***************
*** 49,53 ****
#define MAX_CHANS 8 /* channels for soundfiles 1,2,4,8 */
! #ifdef NT
#define BINWRITEMODE "wb"
#endif
--- 44,48 ----
#define MAX_CHANS 8 /* channels for soundfiles 1,2,4,8 */
! #ifdef __WIN32__
#define BINWRITEMODE "wb"
#endif
Index: tavg~.c
===================================================================
RCS file: /cvsroot/pure-data/externals/zexy/src/tavg~.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tavg~.c 19 May 2005 09:42:55 -0000 1.2
--- tavg~.c 9 Jun 2005 12:17:03 -0000 1.3
***************
*** 18,31 ****
#include <math.h>
- #ifdef NT
- #define sqrtf sqrt
- #endif
-
- #ifdef MACOSX
- #define sqrtf sqrt
- #endif
-
-
-
/* triggered average :: arithmetic mean between last and current BANG */
--- 18,21 ----
Index: symbol2list.c
===================================================================
RCS file: /cvsroot/pure-data/externals/zexy/src/symbol2list.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** symbol2list.c 19 May 2005 09:42:55 -0000 1.2
--- symbol2list.c 9 Jun 2005 12:17:03 -0000 1.3
***************
*** 19,26 ****
#include <string.h>
- #ifndef NT
- # define STATIC_INLINE static
- #endif
-
/*
* symbol2list: convert a symbol into a list (with given delimiters)
--- 19,22 ----
Index: operating_system.c
===================================================================
RCS file: /cvsroot/pure-data/externals/zexy/src/operating_system.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** operating_system.c 19 May 2005 09:42:55 -0000 1.2
--- operating_system.c 9 Jun 2005 12:17:03 -0000 1.3
***************
*** 43,47 ****
#elif defined __APPLE__
s=gensym("macos");
! #elif defined NT
s=gensym("windows");
#endif
--- 43,47 ----
#elif defined __APPLE__
s=gensym("macos");
! #elif defined __WIN32__
s=gensym("windows");
#endif
Index: lpt.c
===================================================================
RCS file: /cvsroot/pure-data/externals/zexy/src/lpt.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** lpt.c 19 May 2005 09:42:55 -0000 1.3
--- lpt.c 9 Jun 2005 12:17:03 -0000 1.4
***************
*** 41,45 ****
# include <stdlib.h>
! # ifdef NT
/* on windoze everything is so complicated... */
extern int read_parport(int port);
--- 41,45 ----
# include <stdlib.h>
! # ifdef __WIN32__
/* on windoze everything is so complicated... */
extern int read_parport(int port);
***************
*** 78,82 ****
return inb(port);
}
! # endif /* NT */
#endif /* Z_WANT_LP */
--- 78,82 ----
return inb(port);
}
! # endif /* __WIN32__ */
#endif /* Z_WANT_LP */
Index: length.c
===================================================================
RCS file: /cvsroot/pure-data/externals/zexy/src/length.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** length.c 19 May 2005 09:42:55 -0000 1.2
--- length.c 9 Jun 2005 12:17:03 -0000 1.3
***************
*** 20,28 ****
#include <math.h>
- #ifdef MACOSX
- #define sqrtf sqrt
- #endif
-
-
static t_class *length_class;
--- 20,23 ----
More information about the Pd-cvs
mailing list