get rid of _ANSI_ARGS_

6 files changed, 54 insertions, 46 deletions

diff --git a/ChangeLog b/ChangeLog
index 19761ac..2bc2406 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-04-26  Jan Nijtmans  <nijtmans@users.sf.net>
+
+	* generic/tclStubInit.c:    get rid of _ANSI_ARGS_
+	* generic/tclIntPlatDecls.h
+	* unix/tclUnixPort.h
+	* unix/tclAppInit.c
+	* win/tclAppInit.c
+
 2012-04-24  Jan Nijtmans  <nijtmans@users.sf.net>
 
 	* generic/tclInt.decls:      [Bug 3508771] load tclreg.dll in cygwin tclsh
diff --git a/generic/tclIntPlatDecls.h b/generic/tclIntPlatDecls.h
index 8c9545a..60501c9 100644
--- a/generic/tclIntPlatDecls.h
+++ b/generic/tclIntPlatDecls.h
@@ -1111,25 +1111,25 @@ extern TclIntPlatStubs *tclIntPlatStubsPtr;
 #   undef TclpOpenFile
 #   undef TclpCreateCommandChannel
 #   ifdef __CYGWIN__
-#	define TclpCreateProcess ((int (*) _ANSI_ARGS_((Tcl_Interp *, int, \
-		CONST char **, TclFile, TclFile, TclFile, Tcl_Pid *))) \
+#	define TclpCreateProcess ((int (*) (Tcl_Interp *, int, \
+		CONST char **, TclFile, TclFile, TclFile, Tcl_Pid *)) \
 		tclIntPlatStubsPtr->tclMacOSXGetFileAttribute)
-#	define TclpMakeFile ((TclFile (*) _ANSI_ARGS_((Tcl_Channel channel, \
-	    int direction))) tclIntPlatStubsPtr->tclMacOSXMatchType)
-#	define TclpOpenFile ((TclFile (*) _ANSI_ARGS_((CONST char *, int))) \
+#	define TclpMakeFile ((TclFile (*) (Tcl_Channel channel, \
+	    int direction)) tclIntPlatStubsPtr->tclMacOSXMatchType)
+#	define TclpOpenFile ((TclFile (*) (CONST char *, int)) \
 	    tclIntPlatStubsPtr->tclMacOSXNotifierAddRunLoopMode)
-#	define TclpCreateCommandChannel ((Tcl_Channel (*) _ANSI_ARGS_((TclFile, TclFile, \
-	    TclFile, int, Tcl_Pid *))) tclIntPlatStubsPtr->tclIntPlatReserved13)
+#	define TclpCreateCommandChannel ((Tcl_Channel (*) (TclFile, TclFile, \
+	    TclFile, int, Tcl_Pid *)) tclIntPlatStubsPtr->tclIntPlatReserved13)
 #   else
-#	define TclpCreateProcess ((int (*) _ANSI_ARGS_((Tcl_Interp *, int, \
-		CONST char **, TclFile, TclFile, TclFile, Tcl_Pid *))) \
+#	define TclpCreateProcess ((int (*) (Tcl_Interp *, int, \
+		CONST char **, TclFile, TclFile, TclFile, Tcl_Pid *)) \
 		tclIntPlatStubsPtr->tclWinGetTclInstance)
-#	define TclpMakeFile ((TclFile (*) _ANSI_ARGS_((Tcl_Channel channel, \
-	    int direction))) tclIntPlatStubsPtr->tclWinNToHS)
-#	define TclpOpenFile ((TclFile (*) _ANSI_ARGS_((CONST char *, int))) \
+#	define TclpMakeFile ((TclFile (*) (Tcl_Channel channel, \
+	    int direction)) tclIntPlatStubsPtr->tclWinNToHS)
+#	define TclpOpenFile ((TclFile (*) (CONST char *, int)) \
 	    tclIntPlatStubsPtr->tclWinSetSockOpt)
-#	define TclpCreateCommandChannel ((Tcl_Channel (*) _ANSI_ARGS_((TclFile, TclFile, \
-	    TclFile, int, Tcl_Pid *))) tclIntPlatStubsPtr->tclWinGetServByName)
+#	define TclpCreateCommandChannel ((Tcl_Channel (*) (TclFile, TclFile, \
+	    TclFile, int, Tcl_Pid *)) tclIntPlatStubsPtr->tclWinGetServByName)
 
 #	undef TclpCreateTempFile
 #	undef TclGetAndDetachPids
@@ -1138,17 +1138,17 @@ extern TclIntPlatStubs *tclIntPlatStubsPtr;
 #	undef TclpInetNtoa
 #	undef TclUnixWaitForFile
 
-#	define TclpCreateTempFile ((TclFile (*) _ANSI_ARGS_((CONST char *))) \
+#	define TclpCreateTempFile ((TclFile (*) (CONST char *)) \
 		tclIntPlatStubsPtr->tclWinGetPlatformId)
-#	define TclGetAndDetachPids ((void (*) _ANSI_ARGS_((Tcl_Interp *, Tcl_Channel))) \
+#	define TclGetAndDetachPids ((void (*) (Tcl_Interp *, Tcl_Channel)) \
 	    tclIntPlatStubsPtr->tclWinConvertError)
-#	define TclpCloseFile ((int (*) _ANSI_ARGS_((TclFile))) \
+#	define TclpCloseFile ((int (*) (TclFile)) \
 	    tclIntPlatStubsPtr->tclWinConvertWSAError)
-#	define TclpCreatePipe ((int (*)_ANSI_ARGS_((TclFile *, TclFile *))) \
+#	define TclpCreatePipe ((int (*) (TclFile *, TclFile *)) \
 	    tclIntPlatStubsPtr->tclWinGetSockOpt)
-#	define TclpInetNtoa ((char *(*) _ANSI_ARGS_((struct in_addr addr))) \
+#	define TclpInetNtoa ((char *(*) (struct in_addr addr)) \
 	    tclIntPlatStubsPtr->tclIntPlatReserved13)
-#	define TclUnixWaitForFile (int (*) _ANSI_ARGS_((int, int, int))) \
+#	define TclUnixWaitForFile (int (*) (int, int, int)) \
 		tclIntPlatStubsPtr->tclpGetPid)
 #	endif
 # endif
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 03b363d..2dc8c40 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -193,27 +193,27 @@ Tcl_WinTCharToUtf(
 	    string, len, dsPtr);
 }
 
-#define Tcl_MacOSXOpenBundleResources (int (*) _ANSI_ARGS_(( \
-		Tcl_Interp *, const char *, int, int, char *))) Tcl_WinUtfToTChar
-#define Tcl_MacOSXOpenVersionedBundleResources (int (*) _ANSI_ARGS_(( \
-		Tcl_Interp *, const char *, const char *, int, int, char *))) Tcl_WinTCharToUtf
-#define TclMacOSXGetFileAttribute (int (*) _ANSI_ARGS_((Tcl_Interp *,  \
-		int, Tcl_Obj *, Tcl_Obj **))) TclpCreateProcess
-#define TclMacOSXMatchType (int (*) _ANSI_ARGS_((Tcl_Interp *, const char *, \
-		const char *, Tcl_StatBuf *, Tcl_GlobTypeData *))) TclpMakeFile
-#define TclMacOSXNotifierAddRunLoopMode (void (*) _ANSI_ARGS_((const void *))) TclpOpenFile
-#define TclpLocaltime_unix (struct tm *(*) _ANSI_ARGS_((const time_t *))) TclGetAndDetachPids
-#define TclpGmtime_unix (struct tm *(*) _ANSI_ARGS_((const time_t *))) TclpCloseFile
+#define Tcl_MacOSXOpenBundleResources (int (*) ( \
+		Tcl_Interp *, const char *, int, int, char *)) Tcl_WinUtfToTChar
+#define Tcl_MacOSXOpenVersionedBundleResources (int (*) ( \
+		Tcl_Interp *, const char *, const char *, int, int, char *)) Tcl_WinTCharToUtf
+#define TclMacOSXGetFileAttribute (int (*) (Tcl_Interp *,  \
+		int, Tcl_Obj *, Tcl_Obj **)) TclpCreateProcess
+#define TclMacOSXMatchType (int (*) (Tcl_Interp *, const char *, \
+		const char *, Tcl_StatBuf *, Tcl_GlobTypeData *)) TclpMakeFile
+#define TclMacOSXNotifierAddRunLoopMode (void (*) (const void *)) TclpOpenFile
+#define TclpLocaltime_unix (struct tm *(*) (const time_t *)) TclGetAndDetachPids
+#define TclpGmtime_unix (struct tm *(*) (const time_t *)) TclpCloseFile
 
 #elif !defined(__WIN32__) /* UNIX and MAC */
-#   define TclWinConvertError (void (*) _ANSI_ARGS_((unsigned int))) TclGetAndDetachPids
-#   define TclWinConvertWSAError (void (*) _ANSI_ARGS_((unsigned int))) TclpCloseFile
+#   define TclWinConvertError (void (*) (unsigned int)) TclGetAndDetachPids
+#   define TclWinConvertWSAError (void (*) (unsigned int)) TclpCloseFile
 #   define TclWinGetPlatformId (int (*)()) TclpCreateTempFile
 #   define TclWinGetTclInstance (void *(*)()) TclpCreateProcess
-#   define TclWinNToHS (unsigned short (*) _ANSI_ARGS_((unsigned short ns))) TclpMakeFile
-#   define TclWinSetSockOpt (int (*) _ANSI_ARGS_((void *, int, int, const char *, int))) TclpOpenFile
-#   define TclWinGetSockOpt (int (*) _ANSI_ARGS_((void *, int, int, char *, int *))) TclpCreatePipe
-#   define TclWinGetServByName (struct servent *(*) _ANSI_ARGS_((const char *nm, const char *proto))) TclpCreateCommandChannel
+#   define TclWinNToHS (unsigned short (*) (unsigned short ns)) TclpMakeFile
+#   define TclWinSetSockOpt (int (*) (void *, int, int, const char *, int)) TclpOpenFile
+#   define TclWinGetSockOpt (int (*) (void *, int, int, char *, int *)) TclpCreatePipe
+#   define TclWinGetServByName (struct servent *(*) (const char *nm, const char *proto)) TclpCreateCommandChannel
 #   define TclIntPlatReserved13 (void (*) ()) TclpInetNtoa
 #   define TclWinAddProcess 0
 #   define TclWinNoBackslash 0
diff --git a/unix/tclAppInit.c b/unix/tclAppInit.c
index b9c64b1..dac782b 100644
--- a/unix/tclAppInit.c
+++ b/unix/tclAppInit.c
@@ -26,8 +26,8 @@ extern Tcl_PackageInitProc	Tcltest_Init;
 #endif /* TCL_TEST */
 
 #ifdef TCL_XT_TEST
-extern void		XtToolkitInitialize _ANSI_ARGS_((void));
-extern int		Tclxttest_Init _ANSI_ARGS_((Tcl_Interp *interp));
+extern void		XtToolkitInitialize (void);
+extern int		Tclxttest_Init (Tcl_Interp *interp);
 #endif
 
 /*
@@ -62,7 +62,7 @@ main(
 #ifndef TCL_LOCAL_APPINIT
 #define TCL_LOCAL_APPINIT Tcl_AppInit
 #endif
-    extern int TCL_LOCAL_APPINIT _ANSI_ARGS_((Tcl_Interp *interp));
+    extern int TCL_LOCAL_APPINIT (Tcl_Interp *interp);
 
     /*
      * The following #if block allows you to change how Tcl finds the startup
@@ -71,7 +71,7 @@ main(
      */
 
 #ifdef TCL_LOCAL_MAIN_HOOK
-    extern int TCL_LOCAL_MAIN_HOOK _ANSI_ARGS_((int *argc, char ***argv));
+    extern int TCL_LOCAL_MAIN_HOOK (int *argc, char ***argv);
 #endif
 
 #ifdef TCL_XT_TEST
diff --git a/unix/tclUnixPort.h b/unix/tclUnixPort.h
index 0b767d6..5abe602 100644
--- a/unix/tclUnixPort.h
+++ b/unix/tclUnixPort.h
@@ -259,8 +259,8 @@ MODULE_SCOPE int TclUnixSetBlockingMode(int fd, int mode);
 #endif
 
 #ifdef GETTOD_NOT_DECLARED
-EXTERN int		gettimeofday _ANSI_ARGS_((struct timeval *tp,
-			    struct timezone *tzp));
+EXTERN int		gettimeofday (struct timeval *tp,
+			    struct timezone *tzp);
 #endif
 
 /*
@@ -622,7 +622,7 @@ EXTERN struct tm *     	TclpGmtime(CONST time_t *);
 #	ifdef HAVE_PTHREAD_GETATTR_NP
 #	    define TclpPthreadGetAttrs	pthread_getattr_np
 #	    ifdef GETATTRNP_NOT_DECLARED
-EXTERN int pthread_getattr_np _ANSI_ARGS_((pthread_t, pthread_attr_t *));
+EXTERN int pthread_getattr_np (pthread_t, pthread_attr_t *);
 #	    endif
 #	endif /* HAVE_PTHREAD_GETATTR_NP */
 #   endif /* HAVE_PTHREAD_ATTR_GET_NP */
diff --git a/win/tclAppInit.c b/win/tclAppInit.c
index 289a3c3..0edd2c3 100644
--- a/win/tclAppInit.c
+++ b/win/tclAppInit.c
@@ -59,7 +59,7 @@ main(
 #ifndef TCL_LOCAL_APPINIT
 #define TCL_LOCAL_APPINIT Tcl_AppInit
 #endif
-    extern int TCL_LOCAL_APPINIT _ANSI_ARGS_((Tcl_Interp *interp));
+    extern int TCL_LOCAL_APPINIT (Tcl_Interp *interp);
 
     /*
      * The following #if block allows you to change how Tcl finds the startup
@@ -68,7 +68,7 @@ main(
      */
 
 #ifdef TCL_LOCAL_MAIN_HOOK
-    extern int TCL_LOCAL_MAIN_HOOK _ANSI_ARGS_((int *argc, char ***argv));
+    extern int TCL_LOCAL_MAIN_HOOK (int *argc, char ***argv);
 #endif
 
     char *p;