$NetBSD: patch-ac,v 1.6 2010/02/15 18:24:59 is Exp $ --- main.cc.orig 1996-05-03 13:27:22.000000000 +0000 +++ main.cc @@ -63,7 +63,7 @@ extern "C" { #include "inet.h" #include "Tcl.h" -extern "C" int Tk_StripchartCmd(ClientData, Tcl_Interp*, int ac, char** av); +extern "C" int Tk_StripchartCmd(ClientData, Tcl_Interp*, int ac, const char** av); #ifdef WIN32 extern "C" int WinPutsCmd(ClientData, Tcl_Interp*, int ac, char** av); extern "C" int WinGetUserName(ClientData, Tcl_Interp*, int ac, char** av); @@ -132,13 +132,13 @@ static SIGRET DoQuit(SIGARGS) void initcatchers() { - signal(SIGINT, DoQuit); + signal(SIGINT, (void (*)(int))DoQuit); #ifdef SIGHUP - signal(SIGHUP, DoQuit); + signal(SIGHUP, (void (*)(int))DoQuit); #endif - signal(SIGTERM, DoQuit); + signal(SIGTERM, (void (*)(int))DoQuit); #ifdef SIGCHLD - signal(SIGCHLD, ReapChild); + signal(SIGCHLD, (void (*)(int))ReapChild); #endif } @@ -162,7 +162,7 @@ public: else { Tk_Window tk = t.tkmain(); Tk_Uid uid = Tk_GetUid((char*)argv[1]); - XFontStruct* p = Tk_GetFontStruct(t.interp(), tk, uid); + Tk_Font p = Tk_GetFont(t.interp(), tk, uid); t.result(p != 0 ? "1" : "0"); } return (TCL_OK);