From 189dc0720d07929d20d63d408619de129f31c478 Mon Sep 17 00:00:00 2001
From: nijtmans <nijtmans>
Date: Thu, 29 Apr 2010 09:23:57 +0000
Subject: Include "tcl.h",  not <tcl.h>, like everywhere else, to insure that
 the version in the Tcl distribution is used, not some version from somewhere
 else.

---
 ChangeLog        | 8 ++++++++
 compat/dirent2.h | 6 ++----
 compat/dlfcn.h   | 6 ++----
 compat/stdlib.h  | 5 +----
 compat/string.h  | 6 +++---
 compat/unistd.h  | 6 ++----
 6 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4146def..94e159b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-04-29  Jan Nijtmans  <nijtmans@users.sf.net>
+
+	* compat/dirent2.h    Include "tcl.h",  not <tcl.h>,
+	* compat/dlfcn.h      like everywhere else, to insure
+	* compat/stdlib.h     that the version in the Tcl
+	* compat/string.h     distribution is used, not some
+	* compat/unistd.h     version from somewhere else.
+
 2010-04-28  Jan Nijtmans  <nijtmans@users.sf.net>
 
 	* win/Makefile.in      Remove unused @MAN2TCLFLAGS@
diff --git a/compat/dirent2.h b/compat/dirent2.h
index 8deed91..794a6c4 100644
--- a/compat/dirent2.h
+++ b/compat/dirent2.h
@@ -10,15 +10,13 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: dirent2.h,v 1.3 2008/09/03 05:43:31 dgp Exp $
+ * RCS: @(#) $Id: dirent2.h,v 1.4 2010/04/29 09:23:57 nijtmans Exp $
  */
 
 #ifndef _DIRENT
 #define _DIRENT
 
-#ifndef _TCL
-#include <tcl.h>
-#endif
+#include "tcl.h"
 
 /*
  * Dirent structure, which holds information about a single
diff --git a/compat/dlfcn.h b/compat/dlfcn.h
index ef8ff0c..ce04fb2 100644
--- a/compat/dlfcn.h
+++ b/compat/dlfcn.h
@@ -17,7 +17,7 @@
  *	for any results of using the software, alterations are clearly marked
  *	as such, and this notice is not modified.
  *
- * RCS: @(#) $Id: dlfcn.h,v 1.4 2008/12/18 06:40:03 nijtmans Exp $
+ * RCS: @(#) $Id: dlfcn.h,v 1.5 2010/04/29 09:23:57 nijtmans Exp $
  */
 
 /*
@@ -29,9 +29,7 @@
 #ifndef __dlfcn_h__
 #define __dlfcn_h__
 
-#ifndef _TCL
-#include <tcl.h>
-#endif
+#include "tcl.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/compat/stdlib.h b/compat/stdlib.h
index 1fe0a76..2c19c7f 100644
--- a/compat/stdlib.h
+++ b/compat/stdlib.h
@@ -13,15 +13,12 @@
  * 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:27:04 dkf Exp $
+ * RCS: @(#) $Id: stdlib.h,v 1.5 2010/04/29 09:23:57 nijtmans Exp $
  */
 
 #ifndef _STDLIB
 #define _STDLIB
 
-#include <tcl.h>
-/* TODO: Do we need tcl.h any more? */
-
 extern void		abort(void);
 extern double		atof(const char *string);
 extern int		atoi(const char *string);
diff --git a/compat/string.h b/compat/string.h
index e452183..0be1ec1 100644
--- a/compat/string.h
+++ b/compat/string.h
@@ -9,13 +9,13 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: string.h,v 1.8 2008/05/02 10:27:04 dkf Exp $
+ * RCS: @(#) $Id: string.h,v 1.9 2010/04/29 09:23:57 nijtmans Exp $
  */
 
 #ifndef _STRING
 #define _STRING
 
-#include <tcl.h>
+#include "tcl.h"
 
 /*
  * The following #include is needed to define size_t. (This used to include
@@ -50,7 +50,7 @@ extern char *		strerror(int error);
 extern size_t		strlen(const char *string);
 extern int		strncasecmp(const char *s1, const char *s2, size_t n);
 extern char *		strncat(char *dst, const char *src, size_t numChars);
-extern int		strncmp(const char *s1, const char *s2,size_t nChars);
+extern int		strncmp(const char *s1, const char *s2, size_t nChars);
 extern char *		strncpy(char *dst, const char *src, size_t numChars);
 extern char *		strpbrk(const char *string, const char *chars);
 extern char *		strrchr(const char *string, int c);
diff --git a/compat/unistd.h b/compat/unistd.h
index 838e7ab..44ca64a 100644
--- a/compat/unistd.h
+++ b/compat/unistd.h
@@ -10,16 +10,14 @@
  * 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.4 2008/05/04 07:28:47 nijtmans Exp $
+ * RCS: @(#) $Id: unistd.h,v 1.5 2010/04/29 09:23:57 nijtmans Exp $
  */
 
 #ifndef _UNISTD
 #define _UNISTD
 
+#include "tcl.h"
 #include <sys/types.h>
-#ifndef _TCL
-#   include "tcl.h"
-#endif
 
 #ifndef NULL
 #define NULL    0
-- 
cgit v0.12