From 019c0e56579fe7f94982434d8efcd7b00d8df0aa Mon Sep 17 00:00:00 2001 From: Miller Puckette Date: Fri, 28 Dec 2007 03:43:06 +0000 Subject: ... and again trying to check in 0.41-0 test 10 svn path=/trunk/; revision=9108 --- pd/src/s_inter.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'pd/src/s_inter.c') diff --git a/pd/src/s_inter.c b/pd/src/s_inter.c index 9945466f..816e6207 100644 --- a/pd/src/s_inter.c +++ b/pd/src/s_inter.c @@ -90,7 +90,6 @@ struct _socketreceiver extern char *pd_version; extern int sys_guisetportnumber; -extern char sys_font[]; /* tb: typeface */ static int sys_nfdpoll; static t_fdpoll *sys_fdpoll; @@ -849,7 +848,8 @@ void glob_watchdog(t_pd *dummy) #define FIRSTPORTNUM 5400 -static int defaultfontshit[] = { +#define MAXFONTS 21 +static int defaultfontshit[MAXFONTS] = { 8, 5, 9, 10, 6, 10, 12, 7, 13, 14, 9, 17, 16, 10, 19, 24, 15, 28, 24, 15, 28}; #define NDEFAULTFONT (sizeof(defaultfontshit)/sizeof(*defaultfontshit)) @@ -1237,7 +1237,7 @@ int sys_startgui(const char *guidir) sys_guisock = accept(xsock, (struct sockaddr *) &server, (socklen_t *)&len); #ifdef OOPS - close(xsock); + sys_closesocket(xsock); #endif if (sys_guisock < 0) sys_sockerror("accept"); if (sys_verbose) @@ -1257,8 +1257,8 @@ int sys_startgui(const char *guidir) #endif sys_get_audio_apis(buf); sys_get_midi_apis(buf2); - sys_vgui("pdtk_pd_startup {%s} %s %s {%s}\n", pd_version, buf, buf2, - sys_font); + sys_vgui("pdtk_pd_startup {%s} %s %s {%s} %s\n", pd_version, buf, buf2, + sys_font, sys_fontweight); } return (0); @@ -1292,7 +1292,7 @@ void glob_quit(void *dummy) sys_vgui("exit\n"); if (!sys_nogui) { - close(sys_guisock); + sys_closesocket(sys_guisock); sys_rmpollfn(sys_guisock); } sys_bail(0); -- cgit v1.2.1