summaryrefslogtreecommitdiffstats
path: root/compat
diff options
context:
space:
mode:
authornijtmans <nijtmans>2010-04-20 08:17:20 (GMT)
committernijtmans <nijtmans>2010-04-20 08:17:20 (GMT)
commit64c4b08a44ece02ac3c52d893e73c98b5e8f6cc5 (patch)
treeb14b56efeb6e96f005aa0454f988f6b043fc40ab /compat
parentf76376d447ad977082d1744f9e90040047b5d08e (diff)
downloadtk-64c4b08a44ece02ac3c52d893e73c98b5e8f6cc5.zip
tk-64c4b08a44ece02ac3c52d893e73c98b5e8f6cc5.tar.gz
tk-64c4b08a44ece02ac3c52d893e73c98b5e8f6cc5.tar.bz2
Make sure that tkWinPort.h is always included
before tcl.h, otherwise the fallback for TCHAR might go off before the inclusion of <tchar.h>
Diffstat (limited to 'compat')
-rw-r--r--compat/stdlib.h6
-rw-r--r--compat/unistd.h4
2 files changed, 6 insertions, 4 deletions
diff --git a/compat/stdlib.h b/compat/stdlib.h
index 546e5ed..ea66007 100644
--- a/compat/stdlib.h
+++ b/compat/stdlib.h
@@ -13,13 +13,15 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: stdlib.h,v 1.4 2008/05/02 10:28:18 dkf Exp $
+ * RCS: @(#) $Id: stdlib.h,v 1.5 2010/04/20 08:17:26 nijtmans Exp $
*/
#ifndef _STDLIB
#define _STDLIB
-#include <tcl.h>
+#ifndef _TCL
+# include <tcl.h>
+#endif
extern void abort(void);
extern double atof(const char *string);
diff --git a/compat/unistd.h b/compat/unistd.h
index cb9f8c3..396e17c 100644
--- a/compat/unistd.h
+++ b/compat/unistd.h
@@ -10,7 +10,7 @@
* no representations about the suitability of this software for any purpose.
* It is provided "as is" without express or implied warranty.
*
- * RCS: @(#) $Id: unistd.h,v 1.3 2008/05/02 10:28:18 dkf Exp $
+ * RCS: @(#) $Id: unistd.h,v 1.4 2010/04/20 08:17:26 nijtmans Exp $
*/
#ifndef _UNISTD
@@ -18,7 +18,7 @@
#include <sys/types.h>
#ifndef _TCL
-# include "tcl.h"
+# include <tcl.h>
#endif
#ifndef NULL