summaryrefslogtreecommitdiffstats
path: root/win/tkWinPort.h
diff options
context:
space:
mode:
authorstanton <stanton>1999-04-16 01:51:06 (GMT)
committerstanton <stanton>1999-04-16 01:51:06 (GMT)
commit03656f44f81469f459031fa3a4a7b09c8bc77712 (patch)
tree31378e81bd58f8c726fc552d6b30cbf3ca07497b /win/tkWinPort.h
parent404fc236f34304df53b7e44bc7971d786b87d453 (diff)
downloadtk-03656f44f81469f459031fa3a4a7b09c8bc77712.zip
tk-03656f44f81469f459031fa3a4a7b09c8bc77712.tar.gz
tk-03656f44f81469f459031fa3a4a7b09c8bc77712.tar.bz2
* Merged 8.1 branch into the main trunk
Diffstat (limited to 'win/tkWinPort.h')
-rw-r--r--win/tkWinPort.h15
1 files changed, 4 insertions, 11 deletions
diff --git a/win/tkWinPort.h b/win/tkWinPort.h
index d673d46..5391b21 100644
--- a/win/tkWinPort.h
+++ b/win/tkWinPort.h
@@ -6,12 +6,11 @@
* file that contains #ifdefs to handle different flavors of OS.
*
* Copyright (c) 1995-1996 Sun Microsystems, Inc.
- * Copyright (c) 1998 by Scriptics Corporation.
*
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkWinPort.h,v 1.4 1999/03/10 07:04:46 stanton Exp $
+ * RCS: @(#) $Id: tkWinPort.h,v 1.5 1999/04/16 01:51:53 stanton Exp $
*/
#ifndef _WINPORT
@@ -22,6 +21,7 @@
#include <X11/keysym.h>
#include <X11/Xatom.h>
#include <X11/Xutil.h>
+
#include <malloc.h>
#include <errno.h>
#include <ctype.h>
@@ -33,6 +33,7 @@
#include <io.h>
#include <sys/stat.h>
#include <time.h>
+#include <tchar.h>
#ifdef _MSC_VER
# define hypot _hypot
@@ -110,16 +111,8 @@ struct timezone {
int tz_dsttime;
};
-extern int gettimeofday(struct timeval *, struct timezone *);
-
-/*
- * tclInt.h is included to get declarations of the following functions.
- * void panic _ANSI_ARGS_(TCL_VARARGS(char *,format));
- * void TclpGetTime _ANSI_ARGS_((Tcl_Time *time));
- */
-
#ifndef _TCLINT
-# include <tclInt.h>
+#include <tclInt.h>
#endif
#endif /* _WINPORT */