From f14d594a1ae5c9cebc68da40e4a54b9b8ea6825a Mon Sep 17 00:00:00 2001 From: "Markus F.X.J. Oberhumer" Date: Fri, 2 Jul 2004 21:42:45 +0000 Subject: [PATCH] New ACC version. committer: mfx 1088804565 +0000 --- src/acc/acc.h | 2 +- src/acc/acc_defs.h | 4 ++- src/acc/acc_lib.h | 2 ++ src/acc/acclib/wildargv.ch | 70 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 76 insertions(+), 2 deletions(-) create mode 100644 src/acc/acclib/wildargv.ch diff --git a/src/acc/acc.h b/src/acc/acc.h index 01e50a58..5cfcfe9f 100644 --- a/src/acc/acc.h +++ b/src/acc/acc.h @@ -27,7 +27,7 @@ #ifndef __ACC_H_INCLUDED #define __ACC_H_INCLUDED 1 -#define ACC_VERSION 20040623L +#define ACC_VERSION 20040701L #if !defined(ACC_CONFIG_INCLUDE) # define ACC_CONFIG_INCLUDE(file) file diff --git a/src/acc/acc_defs.h b/src/acc/acc_defs.h index fe98aabb..bdd810fd 100644 --- a/src/acc/acc_defs.h +++ b/src/acc/acc_defs.h @@ -42,7 +42,7 @@ # define acc_inline __inline #elif (ACC_CC_PGI) # define acc_inline __inline__ -#elif defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901) +#elif defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) # define acc_inline inline #endif @@ -73,6 +73,8 @@ # define ACC_UNUSED_FUNC(func) if (func) ; else # elif (ACC_CC_MSC && (_MSC_VER < 900)) # define ACC_UNUSED_FUNC(func) if (func) ; else +# elif (ACC_CC_MSC && (_MSC_VER >= 1400)) +# define ACC_UNUSED_FUNC(func) ((void) (void (*)()) func) # elif (ACC_CC_KEILC) # define ACC_UNUSED_FUNC(func) # else diff --git a/src/acc/acc_lib.h b/src/acc/acc_lib.h index 9def79a2..8d7c0b17 100644 --- a/src/acc/acc_lib.h +++ b/src/acc/acc_lib.h @@ -313,6 +313,8 @@ ACCLIB_EXTERN(int, acc_set_binmode) (int, int); ACCLIB_EXTERN(acc_int32l_t, acc_muldiv32) (acc_int32l_t, acc_int32l_t, acc_int32l_t); ACCLIB_EXTERN(acc_uint32l_t, acc_umuldiv32) (acc_uint32l_t, acc_uint32l_t, acc_uint32l_t); +ACCLIB_EXTERN(void, acc_wildargv) (int*, char***); + /************************************************************************* // uclock (real, i.e. "wall" clock) diff --git a/src/acc/acclib/wildargv.ch b/src/acc/acclib/wildargv.ch new file mode 100644 index 00000000..9ece5648 --- /dev/null +++ b/src/acc/acclib/wildargv.ch @@ -0,0 +1,70 @@ +/* ACC -- Automatic Compiler Configuration + + Copyright (C) 1996-2004 Markus Franz Xaver Johannes Oberhumer + All Rights Reserved. + + This software is a copyrighted work licensed under the terms of + the GNU General Public License. Please consult the file "ACC_LICENSE" + for details. + + Markus F.X.J. Oberhumer + + http://www.oberhumer.com/ + */ + + +#define __ACCLIB_WILDARGV_CH_INCLUDED 1 +#if !defined(ACCLIB_PUBLIC) +# define ACCLIB_PUBLIC(r,f) r __ACCLIB_FUNCNAME(f) +#endif + + +/************************************************************************* +// +**************************************************************************/ + +#if (ACC_OS_DOS16 || ACC_OS216 || ACC_OS_WIN16) +#if 0 && (ACC_CC_MSC) + +/* FIXME */ +ACC_EXTERN_C int __acc_cdecl __setargv(void); +ACC_EXTERN_C int __acc_cdecl _setargv(void) { return __setargv(); } + +#endif +#endif + + +#if (ACC_OS_WIN32 || ACC_OS_WIN64) +#if (ACC_CC_INTELC || ACC_CC_MSC) + +ACC_EXTERN_C int __acc_cdecl __setargv(void); +ACC_EXTERN_C int __acc_cdecl _setargv(void) { return __setargv(); } + +#endif +#endif + + +#if (ACC_OS_EMX) + +#define __ACCLIB_HAVE_ACC_WILDARGV 1 +ACCLIB_PUBLIC(void, acc_wildargv) (int* argc, char*** argv) +{ + _response(argc, argv); + _wildcard(argc, argv); +} + +#endif + + +#if !defined(__ACCLIB_HAVE_ACC_WILDARGV) +#define __ACCLIB_HAVE_ACC_WILDARGV 1 +ACCLIB_PUBLIC(void, acc_wildargv) (int* argc, char*** argv) +{ + ACC_UNUSED(argc); ACC_UNUSED(argv); +} +#endif + + +/* +vi:ts=4:et +*/