adc194756f
X11BASE). Submitted by: pointyhat via kris While here fix some more of the warnings, use OpenSSL's MD5 code instead of vendor's own copy, and use srandomdev instead of srandom(hostname+time). Approved by: portmgr (Kirill)
101 lines
3.8 KiB
Text
101 lines
3.8 KiB
Text
--- tkStripchart.c.orig Mon Jun 29 15:17:00 1998
|
|
+++ tkStripchart.c Tue Mar 22 13:02:03 2005
|
|
@@ -329,7 +329,7 @@
|
|
*/
|
|
static void Callback(Stripchart* StripchartPtr);
|
|
-static void ComputeStripchartGeometry(Stripchart* StripchartPtr);
|
|
+static void ComputeStripchartGeometry(const Stripchart* StripchartPtr);
|
|
static int ConfigureStripchart(Tcl_Interp* interp, Stripchart* StripchartPtr,
|
|
- int argc, char** argv, int flags);
|
|
+ int argc, const char** argv, int flags);
|
|
static void DestroyStripchart(char* clientData);
|
|
static void DisplayStripchart(ClientData clientData);
|
|
@@ -337,9 +337,9 @@
|
|
static void EventuallyRedrawStripchart(Stripchart* StripchartPtr,
|
|
int displaybits);
|
|
-static void ReplaceColours(Stripchart* StripchartPtr, int argc, char** argv);
|
|
+static void ReplaceColours(Stripchart* StripchartPtr, int argc, const char** argv);
|
|
static void ScrollStrips(Stripchart* StripchartPtr);
|
|
static void StripchartEventProc(ClientData clientData, XEvent* eventPtr);
|
|
static int StripchartWidgetCmd(ClientData clientData, Tcl_Interp* interp,
|
|
- int argc, char** argv);
|
|
+ int argc, const char** argv);
|
|
static void SetStripchartValue(Stripchart* StripchartPtr, double value);
|
|
static void SwapColours(Stripchart* StripchartPtr);
|
|
@@ -364,5 +364,5 @@
|
|
int
|
|
Tk_StripchartCmd(ClientData clientData, Tcl_Interp *interp, int argc,
|
|
- char **argv)
|
|
+ const char **argv)
|
|
{
|
|
Tk_Window tkwin = (Tk_Window) clientData;
|
|
@@ -419,5 +419,5 @@
|
|
static int
|
|
StripchartWidgetCmd(ClientData clientData, Tcl_Interp *interp,
|
|
- int argc, char **argv)
|
|
+ int argc, const char **argv)
|
|
{
|
|
register Stripchart *StripchartPtr = (Stripchart*)clientData;
|
|
@@ -629,5 +629,5 @@
|
|
static int
|
|
ConfigureStripchart(Tcl_Interp *interp, Stripchart *StripchartPtr,
|
|
- int argc, char** argv, int flags)
|
|
+ int argc, const char** argv, int flags)
|
|
{
|
|
XGCValues gcValues;
|
|
@@ -699,5 +699,5 @@
|
|
*/
|
|
static void
|
|
-ComputeStripchartGeometry(Stripchart* StripchartPtr)
|
|
+ComputeStripchartGeometry(const Stripchart* StripchartPtr)
|
|
{
|
|
int tt = hasatitle(StripchartPtr);
|
|
@@ -1040,5 +1040,5 @@
|
|
*/
|
|
static void
|
|
-ReplaceColours(Stripchart* StripchartPtr, int argc, char** argv)
|
|
+ReplaceColours(Stripchart* StripchartPtr, int argc, const char** argv)
|
|
{
|
|
StripchartPtr->altborder =
|
|
--- vic_tcl.h Thu Sep 9 08:05:49 1999
|
|
+++ vic_tcl.h Thu Sep 23 19:00:33 2004
|
|
@@ -74,6 +77,6 @@
|
|
error(file);
|
|
}
|
|
- inline char* var(const char* varname, int flags = TCL_GLOBAL_ONLY) {
|
|
- return (Tcl_GetVar(tcl_, (char*)varname, flags));
|
|
+ inline CONST char* var(const char* varname, int flags = TCL_GLOBAL_ONLY) {
|
|
+ return (Tcl_GetVar(tcl_, varname, flags));
|
|
}
|
|
/*
|
|
@@ -125,5 +128,5 @@
|
|
void class_name(const char*);
|
|
/* make this public for Sun's compiler */
|
|
- static int callback(ClientData, Tcl_Interp*, int ac, char** av);
|
|
+ static int callback(ClientData, Tcl_Interp*, int ac, CONST char** av);
|
|
static void reset_all();
|
|
protected:
|
|
--- rate-variable.cpp Thu Sep 9 08:21:55 1999
|
|
+++ rate-variable.cpp Thu Sep 23 18:55:10 2004
|
|
@@ -62,11 +62,11 @@
|
|
RateVariable(const char* name) : TclObject(name) { }
|
|
protected:
|
|
- static char* update_rate_var(ClientData, Tcl_Interp*, char* name1,
|
|
- char* name2, int flags);
|
|
+ static char* update_rate_var(ClientData, Tcl_Interp*, const char* name1,
|
|
+ const char* name2, int flags);
|
|
int command(int argc, const char*const* argv);
|
|
} rate_variable_cmd("rate_variable");
|
|
|
|
char* RateVariable::update_rate_var(ClientData clientData, Tcl_Interp* tcl,
|
|
- char* name1, char* name2, int flags)
|
|
+ const char* name1, const char* name2, int flags)
|
|
{
|
|
rv_data* rv = (rv_data*)clientData;
|
|
@@ -81,5 +81,5 @@
|
|
char res[128];
|
|
flags &= TCL_GLOBAL_ONLY;
|
|
- char* cv = Tcl_GetVar2(tcl, name1, name2, flags);
|
|
+ const char* cv = Tcl_GetVar2(tcl, name1, name2, flags);
|
|
if (cv == NULL)
|
|
return (tcl->result);
|