Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13686
Modified Files: Tag: desiredata main.c s_inter.c Log Message: MSYS compat
Index: s_inter.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_inter.c,v retrieving revision 1.5.4.10.2.25.2.11 retrieving revision 1.5.4.10.2.25.2.12 diff -C2 -d -r1.5.4.10.2.25.2.11 -r1.5.4.10.2.25.2.12 *** s_inter.c 8 Dec 2006 04:47:36 -0000 1.5.4.10.2.25.2.11 --- s_inter.c 20 Dec 2006 04:02:40 -0000 1.5.4.10.2.25.2.12 *************** *** 512,515 **** --- 512,516 ---- }
+ #undef max /* for msys compat */ int max(int a, int b) { return ((a)>(b)?(a):(b)); }
Index: main.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/main.c,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** main.c 4 Dec 2006 20:59:52 -0000 1.1.2.1 --- main.c 20 Dec 2006 04:02:40 -0000 1.1.2.2 *************** *** 2,6 ****
extern "C" int sys_main(int argc, char **argv); ! #if defined(_WIN32) && !defined(_CONSOLE) #include <windows.h> #include <stdio.h> --- 2,6 ----
extern "C" int sys_main(int argc, char **argv); ! #if _MSC_VER #include <windows.h> #include <stdio.h>