Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32213
Modified Files: Tag: impd_0_37 g_all_guis.c s_entry.c s_inter.c t_tkcmd.c Log Message: merge mingw tweaks
Index: s_inter.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_inter.c,v retrieving revision 1.1.1.3.2.9 retrieving revision 1.1.1.3.2.9.2.1 diff -C2 -d -r1.1.1.3.2.9 -r1.1.1.3.2.9.2.1 *** s_inter.c 21 Jan 2004 19:53:04 -0000 1.1.1.3.2.9 --- s_inter.c 28 Mar 2004 15:07:12 -0000 1.1.1.3.2.9.2.1 *************** *** 54,58 ****
#ifndef WISHAPP ! #define WISHAPP "wish83.exe" #endif
--- 54,58 ----
#ifndef WISHAPP ! #define WISHAPP "wish85.exe" #endif
Index: t_tkcmd.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/t_tkcmd.c,v retrieving revision 1.1.1.4.4.4 retrieving revision 1.1.1.4.4.5 diff -C2 -d -r1.1.1.4.4.4 -r1.1.1.4.4.5 *** t_tkcmd.c 25 Mar 2004 07:56:15 -0000 1.1.1.4.4.4 --- t_tkcmd.c 28 Mar 2004 15:07:12 -0000 1.1.1.4.4.5 *************** *** 32,35 **** --- 32,36 ---- #pragma warning( disable : 4101 ) /* unused local variables */ #include "tk.h" + int main(int argc, char **argv) { return 0; } /* needed for mingw */ #endif
Index: s_entry.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_entry.c,v retrieving revision 1.1.1.2 retrieving revision 1.1.1.2.4.1 diff -C2 -d -r1.1.1.2 -r1.1.1.2.4.1 *** s_entry.c 9 May 2003 16:03:44 -0000 1.1.1.2 --- s_entry.c 28 Mar 2004 15:07:12 -0000 1.1.1.2.4.1 *************** *** 6,51 **** int sys_main(int argc, char **argv);
- /* WINBASEAPI PVOID WINAPI AddVectoredExceptionHandler( - ULONG FirstHandler, - PVECTORED_EXCEPTION_HANDLER VectoredHandler ); */ - - #ifdef MSW - #if 0 - #incldue "winbase.h" - - LONG NTAPI VectoredExceptionHandler(void *PEXCEPTION_POINTERS) - { - fprintf(stderr, "caught exception\n"); - return(EXCEPTION_CONTINUE_SEARCH); - } - - - int main(int argc, char **argv) - { - printf("Pd entry point\n"); - AddVectoredExceptionHandler( - ULONG FirstHandler, - PVECTORED_EXCEPTION_HANDLER VectoredHandler ); - - - #endif - - #if 1 - int main(int argc, char **argv) - { - __try - { - sys_main(argc, argv); - } - __finally - { - printf("caught an exception; stopping\n"); - } - } - #endif - #else /* not MSW */ int main(int argc, char **argv) { return (sys_main(argc, argv)); } ! #endif --- 6,12 ---- int sys_main(int argc, char **argv);
int main(int argc, char **argv) { return (sys_main(argc, argv)); } !
Index: g_all_guis.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_all_guis.c,v retrieving revision 1.1.1.4.2.4.2.10 retrieving revision 1.1.1.4.2.4.2.11 diff -C2 -d -r1.1.1.4.2.4.2.10 -r1.1.1.4.2.4.2.11 *** g_all_guis.c 28 Mar 2004 08:21:42 -0000 1.1.1.4.2.4.2.10 --- g_all_guis.c 28 Mar 2004 15:07:12 -0000 1.1.1.4.2.4.2.11 *************** *** 20,23 **** --- 20,24 ---- #ifdef MSW #include <io.h> + #define snprintf _snprintf #else #include <unistd.h>