Revision: 41113
http://brlcad.svn.sourceforge.net/brlcad/?rev=41113&view=rev
Author: brlcad
Date: 2010-10-20 04:07:12 +0000 (Wed, 20 Oct 2010)
Log Message:
-----------
need to be more careful when updating to new version of tcl to get ALL mods so
time is not repeatedly wasted fixing the same issues. quell warnings on
shadowing time() and clock().
Modified Paths:
--------------
brlcad/trunk/src/other/tcl/generic/tclIntDecls.h
brlcad/trunk/src/other/tcl/generic/tclIntPlatDecls.h
Modified: brlcad/trunk/src/other/tcl/generic/tclIntDecls.h
===================================================================
--- brlcad/trunk/src/other/tcl/generic/tclIntDecls.h 2010-10-20 02:19:16 UTC
(rev 41112)
+++ brlcad/trunk/src/other/tcl/generic/tclIntDecls.h 2010-10-20 04:07:12 UTC
(rev 41113)
@@ -374,12 +374,12 @@
#ifndef TclpGetTime_TCL_DECLARED
#define TclpGetTime_TCL_DECLARED
/* 77 */
-EXTERN void TclpGetTime (Tcl_Time * time);
+EXTERN void TclpGetTime (Tcl_Time * t);
#endif
#ifndef TclpGetTimeZone_TCL_DECLARED
#define TclpGetTimeZone_TCL_DECLARED
/* 78 */
-EXTERN int TclpGetTimeZone (unsigned long time);
+EXTERN int TclpGetTimeZone (unsigned long t);
#endif
/* Slot 79 is reserved */
/* Slot 80 is reserved */
@@ -644,7 +644,7 @@
#ifndef TclpGetDate_TCL_DECLARED
#define TclpGetDate_TCL_DECLARED
/* 133 */
-EXTERN struct tm * TclpGetDate (CONST time_t * time, int useGMT);
+EXTERN struct tm * TclpGetDate (CONST time_t * t, int useGMT);
#endif
/* Slot 134 is reserved */
/* Slot 135 is reserved */
@@ -869,12 +869,12 @@
#ifndef TclpLocaltime_TCL_DECLARED
#define TclpLocaltime_TCL_DECLARED
/* 182 */
-EXTERN struct tm * TclpLocaltime (CONST time_t * clock);
+EXTERN struct tm * TclpLocaltime (CONST time_t * t);
#endif
#ifndef TclpGmtime_TCL_DECLARED
#define TclpGmtime_TCL_DECLARED
/* 183 */
-EXTERN struct tm * TclpGmtime (CONST time_t * clock);
+EXTERN struct tm * TclpGmtime (CONST time_t * t);
#endif
/* Slot 184 is reserved */
/* Slot 185 is reserved */
@@ -1185,8 +1185,8 @@
void (*tclpFree) (char * ptr); /* 74 */
unsigned long (*tclpGetClicks) (void); /* 75 */
unsigned long (*tclpGetSeconds) (void); /* 76 */
- void (*tclpGetTime) (Tcl_Time * time); /* 77 */
- int (*tclpGetTimeZone) (unsigned long time); /* 78 */
+ void (*tclpGetTime) (Tcl_Time * t); /* 77 */
+ int (*tclpGetTimeZone) (unsigned long t); /* 78 */
void *reserved79;
void *reserved80;
char * (*tclpRealloc) (char * ptr, unsigned int size); /* 81 */
@@ -1249,7 +1249,7 @@
int (*tcl_RemoveInterpResolvers) (Tcl_Interp * interp, CONST char * name);
/* 130 */
void (*tcl_SetNamespaceResolvers) (Tcl_Namespace * namespacePtr,
Tcl_ResolveCmdProc * cmdProc, Tcl_ResolveVarProc * varProc,
Tcl_ResolveCompiledVarProc * compiledVarProc); /* 131 */
int (*tclpHasSockets) (Tcl_Interp * interp); /* 132 */
- struct tm * (*tclpGetDate) (CONST time_t * time, int useGMT); /* 133 */
+ struct tm * (*tclpGetDate) (CONST time_t * t, int useGMT); /* 133 */
void *reserved134;
void *reserved135;
void *reserved136;
@@ -1298,8 +1298,8 @@
Tcl_Obj * (*tcl_GetStartupScript) (CONST char ** encodingNamePtr); /* 179
*/
void *reserved180;
void *reserved181;
- struct tm * (*tclpLocaltime) (CONST time_t * clock); /* 182 */
- struct tm * (*tclpGmtime) (CONST time_t * clock); /* 183 */
+ struct tm * (*tclpLocaltime) (CONST time_t * t); /* 182 */
+ struct tm * (*tclpGmtime) (CONST time_t * t); /* 183 */
void *reserved184;
void *reserved185;
void *reserved186;
Modified: brlcad/trunk/src/other/tcl/generic/tclIntPlatDecls.h
===================================================================
--- brlcad/trunk/src/other/tcl/generic/tclIntPlatDecls.h 2010-10-20
02:19:16 UTC (rev 41112)
+++ brlcad/trunk/src/other/tcl/generic/tclIntPlatDecls.h 2010-10-20
04:07:12 UTC (rev 41113)
@@ -100,12 +100,12 @@
#ifndef TclpLocaltime_unix_TCL_DECLARED
#define TclpLocaltime_unix_TCL_DECLARED
/* 11 */
-EXTERN struct tm * TclpLocaltime_unix (CONST time_t * clock);
+EXTERN struct tm * TclpLocaltime_unix (CONST time_t * t);
#endif
#ifndef TclpGmtime_unix_TCL_DECLARED
#define TclpGmtime_unix_TCL_DECLARED
/* 12 */
-EXTERN struct tm * TclpGmtime_unix (CONST time_t * clock);
+EXTERN struct tm * TclpGmtime_unix (CONST time_t * t);
#endif
#ifndef TclpInetNtoa_TCL_DECLARED
#define TclpInetNtoa_TCL_DECLARED
@@ -320,12 +320,12 @@
#ifndef TclpLocaltime_unix_TCL_DECLARED
#define TclpLocaltime_unix_TCL_DECLARED
/* 11 */
-EXTERN struct tm * TclpLocaltime_unix (CONST time_t * clock);
+EXTERN struct tm * TclpLocaltime_unix (CONST time_t * t);
#endif
#ifndef TclpGmtime_unix_TCL_DECLARED
#define TclpGmtime_unix_TCL_DECLARED
/* 12 */
-EXTERN struct tm * TclpGmtime_unix (CONST time_t * clock);
+EXTERN struct tm * TclpGmtime_unix (CONST time_t * t);
#endif
#ifndef TclpInetNtoa_TCL_DECLARED
#define TclpInetNtoa_TCL_DECLARED
@@ -392,8 +392,8 @@
int (*tclUnixWaitForFile) (int fd, int mask, int timeout); /* 8 */
TclFile (*tclpCreateTempFile) (CONST char * contents); /* 9 */
Tcl_DirEntry * (*tclpReaddir) (DIR * dir); /* 10 */
- struct tm * (*tclpLocaltime_unix) (CONST time_t * clock); /* 11 */
- struct tm * (*tclpGmtime_unix) (CONST time_t * clock); /* 12 */
+ struct tm * (*tclpLocaltime_unix) (CONST time_t * t); /* 11 */
+ struct tm * (*tclpGmtime_unix) (CONST time_t * t); /* 12 */
char * (*tclpInetNtoa) (struct in_addr addr); /* 13 */
int (*tclUnixCopyFile) (CONST char * src, CONST char * dst, CONST
Tcl_StatBuf * statBufPtr, int dontCopyAtts); /* 14 */
#endif /* UNIX */
@@ -441,8 +441,8 @@
int (*tclUnixWaitForFile) (int fd, int mask, int timeout); /* 8 */
TclFile (*tclpCreateTempFile) (CONST char * contents); /* 9 */
Tcl_DirEntry * (*tclpReaddir) (DIR * dir); /* 10 */
- struct tm * (*tclpLocaltime_unix) (CONST time_t * clock); /* 11 */
- struct tm * (*tclpGmtime_unix) (CONST time_t * clock); /* 12 */
+ struct tm * (*tclpLocaltime_unix) (CONST time_t * t); /* 11 */
+ struct tm * (*tclpGmtime_unix) (CONST time_t * t); /* 12 */
char * (*tclpInetNtoa) (struct in_addr addr); /* 13 */
int (*tclUnixCopyFile) (CONST char * src, CONST char * dst, CONST
Tcl_StatBuf * statBufPtr, int dontCopyAtts); /* 14 */
int (*tclMacOSXGetFileAttribute) (Tcl_Interp * interp, int objIndex,
Tcl_Obj * fileName, Tcl_Obj ** attributePtrPtr); /* 15 */
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Download new Adobe(R) Flash(R) Builder(TM) 4
The new Adobe(R) Flex(R) 4 and Flash(R) Builder(TM) 4 (formerly
Flex(R) Builder(TM)) enable the development of rich applications that run
across multiple browsers and platforms. Download your free trials today!
http://p.sf.net/sfu/adobe-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
