From d39d55ae2457b19db2df1d6a3d23504d28d62815 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Tue, 2 Sep 2008 20:56:05 +0000
Subject:         * generic/tcl.h:        Removed the conditional #define of   
      _ANSI_ARGS_ that would support pre-prototype C compilers.  Since        
 _ANSI_ARGS_ is no longer used in tclDecls.h, it's clear no one        
 compiling against Tcl 8.5 headers is making use of a -DNO_PROTOTYPES        
 configuration.

---
 ChangeLog     |  8 ++++++++
 generic/tcl.h | 24 +++++++++++++++---------
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0b03adf..e6d26b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-09-02  Don Porter  <dgp@users.sourceforge.net>
+
+	* generic/tcl.h:	Removed the conditional #define of
+	_ANSI_ARGS_ that would support pre-prototype C compilers.  Since
+	_ANSI_ARGS_ is no longer used in tclDecls.h, it's clear no one
+	compiling against Tcl 8.5 headers is making use of a -DNO_PROTOTYPES
+	configuration.
+
 2008-09-02  Donal K. Fellows  <dkf@users.sf.net>
 
 	* tests/socket.test: Rewrote so as to use tcltest2 better.
diff --git a/generic/tcl.h b/generic/tcl.h
index 4e87df2..d61e9bf 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -13,7 +13,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tcl.h,v 1.267 2008/08/28 16:24:16 dgp Exp $
+ * RCS: @(#) $Id: tcl.h,v 1.268 2008/09/02 20:56:07 dgp Exp $
  */
 
 #ifndef _TCL
@@ -223,11 +223,23 @@ extern "C" {
 #endif
 
 /*
+ * The following _ANSI_ARGS_ macro is to support old extensions
+ * written for older versions of Tcl where it permitted support
+ * for compilers written in the pre-prototype era of C.
+ *
+ * New code should use prototypes.
+ */
+
+#ifndef TCL_NO_DEPRECATED
+#   undef _ANSI_ARGS_
+#   define _ANSI_ARGS_(x)	x
+#endif
+
+/*
  * Definitions that allow this header file to be used either with or without
- * ANSI C features like function prototypes.
+ * ANSI C features.
  */
 
-#undef _ANSI_ARGS_
 #undef CONST
 #ifndef INLINE
 #   define INLINE
@@ -239,12 +251,6 @@ extern "C" {
 #   define CONST
 #endif
 
-#ifndef NO_PROTOTYPES
-#   define _ANSI_ARGS_(x)	x
-#else
-#   define _ANSI_ARGS_(x)	()
-#endif
-
 #ifdef USE_NON_CONST
 #   ifdef USE_COMPAT_CONST
 #      error define at most one of USE_NON_CONST and USE_COMPAT_CONST
-- 
cgit v0.12