[Sumover-dev] [svn commit] r4009 - in vic/branches/mpeg4: win32

[sumover-dev at cs.ucl.ac.uk]

Author: piers
Date: Thu May  3 14:26:20 2007
New Revision: 4009

Modified:
   vic/branches/mpeg4/Tcl.cpp
   vic/branches/mpeg4/main.cpp
   vic/branches/mpeg4/rate-variable.cpp
   vic/branches/mpeg4/tkStripchart.c
   vic/branches/mpeg4/vic_tcl.h
   vic/branches/mpeg4/win32/win32.c

Log:
Changed TCLTK80 check from:
#ifdef TCLTK80 
To one that is based on tcl.h #define's:
#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION == 0)


Modified: vic/branches/mpeg4/Tcl.cpp
==============================================================================
--- vic/branches/mpeg4/Tcl.cpp	(original)
+++ vic/branches/mpeg4/Tcl.cpp	Thu May  3 14:26:20 2007
@@ -215,7 +215,7 @@
 	}
 }
 
-#ifdef TCLTK80
+#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION == 0)
 int TclObject::callback(ClientData cd, Tcl_Interp*, int ac, char** av)
 #else
 int TclObject::callback(ClientData cd, Tcl_Interp*, int ac, const char** av)

Modified: vic/branches/mpeg4/main.cpp
==============================================================================
--- vic/branches/mpeg4/main.cpp	(original)
+++ vic/branches/mpeg4/main.cpp	Thu May  3 14:26:20 2007
@@ -429,14 +429,14 @@
 }
 
 
-#ifdef TCLTK80
+#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION == 0)
 extern "C" int Tk_StripchartCmd(ClientData, Tcl_Interp*, int ac, char** av);
 #else
 extern "C" int Tk_StripchartCmd(ClientData, Tcl_Interp*, int ac, const char** av);
 #endif
 
 #ifdef WIN32
-#ifdef TCLTK80
+#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION == 0)
 extern "C" int WinPutsCmd(ClientData, Tcl_Interp*, int ac, char** av);
 extern "C" int WinGetUserName(ClientData, Tcl_Interp*, int ac, char** av);
 extern "C" int WinReg(ClientData, Tcl_Interp *, int, char **);

Modified: vic/branches/mpeg4/rate-variable.cpp
==============================================================================
--- vic/branches/mpeg4/rate-variable.cpp	(original)
+++ vic/branches/mpeg4/rate-variable.cpp	Thu May  3 14:26:20 2007
@@ -61,7 +61,7 @@
 public:
 	RateVariable(const char* name) : TclObject(name) { }
 protected:
-#ifdef TCLTK80
+#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION == 0)
 	static char* update_rate_var(ClientData, Tcl_Interp*, char* name1,
 				     char* name2, int flags);
 #else
@@ -71,7 +71,7 @@
 	int command(int argc, const char*const* argv);
 } rate_variable_cmd("rate_variable");
 
-#ifdef TCLTK80
+#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION == 0)
 char* RateVariable::update_rate_var(ClientData clientData, Tcl_Interp* tcl,
 		 char* name1, char* name2, int flags) 
 #else

Modified: vic/branches/mpeg4/tkStripchart.c
==============================================================================
--- vic/branches/mpeg4/tkStripchart.c	(original)
+++ vic/branches/mpeg4/tkStripchart.c	Thu May  3 14:26:20 2007
@@ -365,7 +365,7 @@
  *
  *--------------------------------------------------------------
  */
-#ifdef TCLTK80
+#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION == 0)
 int
 Tk_StripchartCmd(ClientData clientData, Tcl_Interp *interp, int argc,
 		 char **argv)

Modified: vic/branches/mpeg4/vic_tcl.h
==============================================================================
--- vic/branches/mpeg4/vic_tcl.h	(original)
+++ vic/branches/mpeg4/vic_tcl.h	Thu May  3 14:26:20 2007
@@ -124,7 +124,7 @@
 	virtual void reset();
 	void class_name(const char*);
 	/* make this public for Sun's compiler */
-#ifdef TCLTK80
+#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION == 0)
 	static int callback(ClientData, Tcl_Interp*, int ac, char** av);
 #else
 	static int callback(ClientData, Tcl_Interp*, int ac, const char** av);

Modified: vic/branches/mpeg4/win32/win32.c
==============================================================================
--- vic/branches/mpeg4/win32/win32.c	(original)
+++ vic/branches/mpeg4/win32/win32.c	Thu May  3 14:26:20 2007
@@ -189,7 +189,7 @@
 		abort();
     }
 
-#ifdef TCLTK80
+#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION == 0)
     TclHasSockets(NULL);	
 	TkWinXInit(hInstance);
 #endif
@@ -294,7 +294,7 @@
  * if a file arg is supplied it [used to] does nothing - ie empty file!
  * Now works with other files.
  */
-#ifdef TCLTK80
+#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION == 0)
 int
 WinPutsCmd(ClientData clientData, Tcl_Interp *interp, int argc, char **argv)
 #else
@@ -396,7 +396,7 @@
     return TCL_OK;
 }
 
-#ifdef TCLTK80
+#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION == 0)
 int
 WinGetUserName(clientData, interp, argc, argv)
 #else
@@ -436,7 +436,7 @@
 		return NULL;
 }
 
-#ifdef TCLTK80
+#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION == 0)
 int 
 WinReg(ClientData clientdata, Tcl_Interp *interp, int argc, char **argv)
 #else