Non-ANSI names need _CRTIMP too

svn path=/trunk/; revision=44089

diff --git a/reactos/include/crt/conio.h b/reactos/include/crt/conio.h
index 74fbbac..3fc4726 100644 (file)
--- a/reactos/include/crt/conio.h
+++ b/reactos/include/crt/conio.h
@@ -84,15 +84,15 @@ extern "C" {
 #endif
 
 #ifndef        NO_OLDNAMES
-  _CRT_NONSTDC_DEPRECATE(_cgets) _CRT_INSECURE_DEPRECATE(_cgets_s) _CRTIMP char *__cdecl cgets(char *_Buffer);
-  _CRT_NONSTDC_DEPRECATE(_cprintf) _CRTIMP int __cdecl cprintf(const char *_Format,...);
-  _CRT_NONSTDC_DEPRECATE(_cputs) _CRTIMP int __cdecl cputs(const char *_Str);
-  _CRT_NONSTDC_DEPRECATE(_cscanf) _CRTIMP int __cdecl cscanf(const char *_Format,...);
-  _CRT_NONSTDC_DEPRECATE(_getch) _CRTIMP int __cdecl getch(void);
-  _CRT_NONSTDC_DEPRECATE(_getche) _CRTIMP int __cdecl getche(void);
-  _CRT_NONSTDC_DEPRECATE(_kbhit) _CRTIMP int __cdecl kbhit(void);
-  _CRT_NONSTDC_DEPRECATE(_putch) _CRTIMP int __cdecl putch(int _Ch);
-  _CRT_NONSTDC_DEPRECATE(_ungetch) _CRTIMP int __cdecl ungetch(int _Ch);
+  _CRTIMP _CRT_NONSTDC_DEPRECATE(_cgets) _CRT_INSECURE_DEPRECATE(_cgets_s) _CRTIMP char *__cdecl cgets(char *_Buffer);
+  _CRTIMP _CRT_NONSTDC_DEPRECATE(_cprintf) _CRTIMP int __cdecl cprintf(const char *_Format,...);
+  _CRTIMP _CRT_NONSTDC_DEPRECATE(_cputs) _CRTIMP int __cdecl cputs(const char *_Str);
+  _CRTIMP _CRT_NONSTDC_DEPRECATE(_cscanf) _CRTIMP int __cdecl cscanf(const char *_Format,...);
+  _CRTIMP _CRT_NONSTDC_DEPRECATE(_getch) _CRTIMP int __cdecl getch(void);
+  _CRTIMP _CRT_NONSTDC_DEPRECATE(_getche) _CRTIMP int __cdecl getche(void);
+  _CRTIMP _CRT_NONSTDC_DEPRECATE(_kbhit) _CRTIMP int __cdecl kbhit(void);
+  _CRTIMP _CRT_NONSTDC_DEPRECATE(_putch) _CRTIMP int __cdecl putch(int _Ch);
+  _CRTIMP _CRT_NONSTDC_DEPRECATE(_ungetch) _CRTIMP int __cdecl ungetch(int _Ch);
 
 #if (defined(_X86_) && !defined(__x86_64))
   _CRT_NONSTDC_DEPRECATE(_inp) _CRTIMP int __cdecl inp(unsigned short);

diff --git a/reactos/include/crt/ctype.h b/reactos/include/crt/ctype.h
index d881539..74f7b1e 100644 (file)
--- a/reactos/include/crt/ctype.h
+++ b/reactos/include/crt/ctype.h
@@ -112,7 +112,7 @@ extern "C" {
   _CRTIMP int __cdecl __iscsymf(int _C);
   _CRTIMP int __cdecl __iscsym(int _C);
 #if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || !defined (NO_OLDNAMES)
-int __cdecl isblank(int _C);
+  _CRTIMP int __cdecl isblank(int _C);
 #endif
 #endif /* !_CTYPE_DEFINED */
 
@@ -156,7 +156,7 @@ int __cdecl isblank(int _C);
   _CRTIMP int __cdecl is_wctype(wint_t _C,wctype_t _Type);
 
 #if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || !defined (NO_OLDNAMES)
-int __cdecl iswblank(wint_t _C);
+  _CRTIMP int __cdecl iswblank(wint_t _C);
 #endif
 #endif
 
@@ -241,10 +241,10 @@ int __cdecl iswblank(wint_t _C);
 
 #ifndef NO_OLDNAMES
 #ifndef _CTYPE_DEFINED
-  _CRT_NONSTDC_DEPRECATE(__isascii) _CRTIMP int __cdecl isascii(int _C);
-  _CRT_NONSTDC_DEPRECATE(__toascii) _CRTIMP int __cdecl toascii(int _C);
-  _CRT_NONSTDC_DEPRECATE(__iscsymf) _CRTIMP int __cdecl iscsymf(int _C);
-  _CRT_NONSTDC_DEPRECATE(__iscsym) _CRTIMP int __cdecl iscsym(int _C);
+  _CRTIMP _CRT_NONSTDC_DEPRECATE(__isascii) _CRTIMP int __cdecl isascii(int _C);
+  _CRTIMP _CRT_NONSTDC_DEPRECATE(__toascii) _CRTIMP int __cdecl toascii(int _C);
+  _CRTIMP _CRT_NONSTDC_DEPRECATE(__iscsymf) _CRTIMP int __cdecl iscsymf(int _C);
+  _CRTIMP _CRT_NONSTDC_DEPRECATE(__iscsym) _CRTIMP int __cdecl iscsym(int _C);
 #else
 #define isascii __isascii
 #define toascii __toascii

diff --git a/reactos/include/crt/direct.h b/reactos/include/crt/direct.h
index f64ceba..e9eb50b 100644 (file)
--- a/reactos/include/crt/direct.h
+++ b/reactos/include/crt/direct.h
@@ -54,10 +54,10 @@ extern "C" {
 
 #define diskfree_t _diskfree_t
 
-  char *__cdecl getcwd(char *_DstBuf,int _SizeInBytes);
-  int __cdecl chdir(const char *_Path);
-  int __cdecl mkdir(const char *_Path);
-  int __cdecl rmdir(const char *_Path);
+  _CRTIMP char *__cdecl getcwd(char *_DstBuf,int _SizeInBytes);
+  _CRTIMP int __cdecl chdir(const char *_Path);
+  _CRTIMP int __cdecl mkdir(const char *_Path);
+  _CRTIMP int __cdecl rmdir(const char *_Path);
 #endif
 
 #ifdef __cplusplus

diff --git a/reactos/include/crt/io.h b/reactos/include/crt/io.h
index 0accf13..2eaae8f 100644 (file)
--- a/reactos/include/crt/io.h
+++ b/reactos/include/crt/io.h
@@ -190,7 +190,7 @@ _CRTIMP char* __cdecl _getcwd (char*, int);
   int __cdecl rename(const char *_OldFilename,const char *_NewFilename);
   _CRTIMP int __cdecl _unlink(const char *_Filename);
 #ifndef        NO_OLDNAMES
-  int __cdecl unlink(const char *_Filename);
+  _CRTIMP int __cdecl unlink(const char *_Filename);
 #endif
 #endif
 
@@ -240,12 +240,12 @@ _CRTIMP char* __cdecl _getcwd (char*, int);
 
 #ifndef NO_OLDNAMES
 #ifndef _UWIN
-  int __cdecl chdir (const char *);
-  char *__cdecl getcwd (char *, int);
-  int __cdecl mkdir (const char *);
-  char *__cdecl mktemp(char *);
-  int __cdecl rmdir (const char*);
-  int __cdecl chmod (const char *, int);
+  _CRTIMP int __cdecl chdir (const char *);
+  _CRTIMP char *__cdecl getcwd (char *, int);
+  _CRTIMP int __cdecl mkdir (const char *);
+  _CRTIMP char *__cdecl mktemp(char *);
+  _CRTIMP int __cdecl rmdir (const char*);
+  _CRTIMP int __cdecl chmod (const char *, int);
 #endif /* _UWIN */
 #endif /* Not NO_OLDNAMES */
 
@@ -297,26 +297,26 @@ _CRTIMP char* __cdecl _getcwd (char*, int);
   _CRTIMP int __cdecl _open_osfhandle(intptr_t _OSFileHandle,int _Flags);
 
 #ifndef        NO_OLDNAMES
-  int __cdecl access(const char *_Filename,int _AccessMode);
-  int __cdecl chmod(const char *_Filename,int _AccessMode);
-  int __cdecl chsize(int _FileHandle,long _Size);
-  int __cdecl close(int _FileHandle);
-  int __cdecl creat(const char *_Filename,int _PermissionMode);
-  int __cdecl dup(int _FileHandle);
-  int __cdecl dup2(int _FileHandleSrc,int _FileHandleDst);
-  int __cdecl eof(int _FileHandle);
-  long __cdecl filelength(int _FileHandle);
-  int __cdecl isatty(int _FileHandle);
-  int __cdecl locking(int _FileHandle,int _LockMode,long _NumOfBytes);
-  long __cdecl lseek(int _FileHandle,long _Offset,int _Origin);
-  char *__cdecl mktemp(char *_TemplateName);
-  int __cdecl open(const char *_Filename,int _OpenFlag,...);
-  int __cdecl read(int _FileHandle,void *_DstBuf,unsigned int _MaxCharCount);
-  int __cdecl setmode(int _FileHandle,int _Mode);
-  int __cdecl sopen(const char *_Filename,int _OpenFlag,int _ShareFlag,...);
-  long __cdecl tell(int _FileHandle);
-  int __cdecl umask(int _Mode);
-  int __cdecl write(int _Filehandle,const void *_Buf,unsigned int _MaxCharCount);
+  _CRTIMP int __cdecl access(const char *_Filename,int _AccessMode);
+  _CRTIMP int __cdecl chmod(const char *_Filename,int _AccessMode);
+  _CRTIMP int __cdecl chsize(int _FileHandle,long _Size);
+  _CRTIMP int __cdecl close(int _FileHandle);
+  _CRTIMP int __cdecl creat(const char *_Filename,int _PermissionMode);
+  _CRTIMP int __cdecl dup(int _FileHandle);
+  _CRTIMP int __cdecl dup2(int _FileHandleSrc,int _FileHandleDst);
+  _CRTIMP int __cdecl eof(int _FileHandle);
+  _CRTIMP long __cdecl filelength(int _FileHandle);
+  _CRTIMP int __cdecl isatty(int _FileHandle);
+  _CRTIMP int __cdecl locking(int _FileHandle,int _LockMode,long _NumOfBytes);
+  _CRTIMP long __cdecl lseek(int _FileHandle,long _Offset,int _Origin);
+  _CRTIMP char *__cdecl mktemp(char *_TemplateName);
+  _CRTIMP int __cdecl open(const char *_Filename,int _OpenFlag,...);
+  _CRTIMP int __cdecl read(int _FileHandle,void *_DstBuf,unsigned int _MaxCharCount);
+  _CRTIMP int __cdecl setmode(int _FileHandle,int _Mode);
+  _CRTIMP int __cdecl sopen(const char *_Filename,int _OpenFlag,int _ShareFlag,...);
+  _CRTIMP long __cdecl tell(int _FileHandle);
+  _CRTIMP int __cdecl umask(int _Mode);
+  _CRTIMP int __cdecl write(int _Filehandle,const void *_Buf,unsigned int _MaxCharCount);
 #endif
 
 #ifdef __cplusplus

diff --git a/reactos/include/crt/memory.h b/reactos/include/crt/memory.h
index b073295..78be808 100644 (file)
--- a/reactos/include/crt/memory.h
+++ b/reactos/include/crt/memory.h
@@ -29,8 +29,8 @@ extern "C" {
   void *__cdecl memset(void *_Dst,int _Val,size_t _Size);
 
 #ifndef        NO_OLDNAMES
-  void *__cdecl memccpy(void *_Dst,const void *_Src,int _Val,size_t _Size);
-  int __cdecl memicmp(const void *_Buf1,const void *_Buf2,size_t _Size);
+  _CRTIMP void *__cdecl memccpy(void *_Dst,const void *_Src,int _Val,size_t _Size);
+  _CRTIMP int __cdecl memicmp(const void *_Buf1,const void *_Buf2,size_t _Size);
 #endif
 #endif
 

diff --git a/reactos/include/crt/process.h b/reactos/include/crt/process.h
index 35555e5..591032f 100644 (file)
--- a/reactos/include/crt/process.h
+++ b/reactos/include/crt/process.h
@@ -135,42 +135,42 @@ extern "C" {
 #define WAIT_CHILD _WAIT_CHILD
 #define WAIT_GRANDCHILD _WAIT_GRANDCHILD
 
-  intptr_t __cdecl cwait(int *_TermStat,intptr_t _ProcHandle,int _Action);
+  _CRTIMP intptr_t __cdecl cwait(int *_TermStat,intptr_t _ProcHandle,int _Action);
 #ifdef __GNUC__
-  int __cdecl execl(const char *_Filename,const char *_ArgList,...);
-  int __cdecl execle(const char *_Filename,const char *_ArgList,...);
-  int __cdecl execlp(const char *_Filename,const char *_ArgList,...);
-  int __cdecl execlpe(const char *_Filename,const char *_ArgList,...);
+  _CRTIMP int __cdecl execl(const char *_Filename,const char *_ArgList,...);
+  _CRTIMP int __cdecl execle(const char *_Filename,const char *_ArgList,...);
+  _CRTIMP int __cdecl execlp(const char *_Filename,const char *_ArgList,...);
+  _CRTIMP int __cdecl execlpe(const char *_Filename,const char *_ArgList,...);
 #else
-    intptr_t __cdecl execl(const char *_Filename,const char *_ArgList,...);
-  intptr_t __cdecl execle(const char *_Filename,const char *_ArgList,...);
-  intptr_t __cdecl execlp(const char *_Filename,const char *_ArgList,...);
-  intptr_t __cdecl execlpe(const char *_Filename,const char *_ArgList,...);
-#endif
-  intptr_t __cdecl spawnl(int,const char *_Filename,const char *_ArgList,...);
-  intptr_t __cdecl spawnle(int,const char *_Filename,const char *_ArgList,...);
-  intptr_t __cdecl spawnlp(int,const char *_Filename,const char *_ArgList,...);
-  intptr_t __cdecl spawnlpe(int,const char *_Filename,const char *_ArgList,...);
-  int __cdecl getpid(void);
+  _CRTIMP intptr_t __cdecl execl(const char *_Filename,const char *_ArgList,...);
+  _CRTIMP intptr_t __cdecl execle(const char *_Filename,const char *_ArgList,...);
+  _CRTIMP intptr_t __cdecl execlp(const char *_Filename,const char *_ArgList,...);
+  _CRTIMP intptr_t __cdecl execlpe(const char *_Filename,const char *_ArgList,...);
+#endif
+  _CRTIMP intptr_t __cdecl spawnl(int,const char *_Filename,const char *_ArgList,...);
+  _CRTIMP intptr_t __cdecl spawnle(int,const char *_Filename,const char *_ArgList,...);
+  _CRTIMP intptr_t __cdecl spawnlp(int,const char *_Filename,const char *_ArgList,...);
+  _CRTIMP intptr_t __cdecl spawnlpe(int,const char *_Filename,const char *_ArgList,...);
+  _CRTIMP int __cdecl getpid(void);
 #ifdef __GNUC__
   /* Those methods are predefined by gcc builtins to return int. So to prevent
      stupid warnings, define them in POSIX way.  This is save, because those
      methods do not return in success case, so that the return value is not
      really dependent to its scalar width.  */
-  int __cdecl execv(const char *_Filename,char *const _ArgList[]);
-  int __cdecl execve(const char *_Filename,char *const _ArgList[],char *const _Env[]);
-  int __cdecl execvp(const char *_Filename,char *const _ArgList[]);
-  int __cdecl execvpe(const char *_Filename,char *const _ArgList[],char *const _Env[]);
+  _CRTIMP int __cdecl execv(const char *_Filename,char *const _ArgList[]);
+  _CRTIMP int __cdecl execve(const char *_Filename,char *const _ArgList[],char *const _Env[]);
+  _CRTIMP int __cdecl execvp(const char *_Filename,char *const _ArgList[]);
+  _CRTIMP int __cdecl execvpe(const char *_Filename,char *const _ArgList[],char *const _Env[]);
 #else
-  intptr_t __cdecl execv(const char *_Filename,char *const _ArgList[]);
-  intptr_t __cdecl execve(const char *_Filename,char *const _ArgList[],char *const _Env[]);
-  intptr_t __cdecl execvp(const char *_Filename,char *const _ArgList[]);
-  intptr_t __cdecl execvpe(const char *_Filename,char *const _ArgList[],char *const _Env[]);
-#endif
-  intptr_t __cdecl spawnv(int,const char *_Filename,char *const _ArgList[]);
-  intptr_t __cdecl spawnve(int,const char *_Filename,char *const _ArgList[],char *const _Env[]);
-  intptr_t __cdecl spawnvp(int,const char *_Filename,char *const _ArgList[]);
-  intptr_t __cdecl spawnvpe(int,const char *_Filename,char *const _ArgList[],char *const _Env[]);
+  _CRTIMP intptr_t __cdecl execv(const char *_Filename,char *const _ArgList[]);
+  _CRTIMP intptr_t __cdecl execve(const char *_Filename,char *const _ArgList[],char *const _Env[]);
+  _CRTIMP intptr_t __cdecl execvp(const char *_Filename,char *const _ArgList[]);
+  _CRTIMP intptr_t __cdecl execvpe(const char *_Filename,char *const _ArgList[],char *const _Env[]);
+#endif
+  _CRTIMP intptr_t __cdecl spawnv(int,const char *_Filename,char *const _ArgList[]);
+  _CRTIMP intptr_t __cdecl spawnve(int,const char *_Filename,char *const _ArgList[],char *const _Env[]);
+  _CRTIMP intptr_t __cdecl spawnvp(int,const char *_Filename,char *const _ArgList[]);
+  _CRTIMP intptr_t __cdecl spawnvpe(int,const char *_Filename,char *const _ArgList[],char *const _Env[]);
 #endif
 
 #ifdef __cplusplus

diff --git a/reactos/include/crt/search.h b/reactos/include/crt/search.h
index a585448..1f487bf 100644 (file)
--- a/reactos/include/crt/search.h
+++ b/reactos/include/crt/search.h
@@ -22,8 +22,8 @@ extern "C" {
   _CRTIMP void *__cdecl _lsearch(const void *_Key,void *_Base,unsigned int *_NumOfElements,unsigned int _SizeOfElements,int (__cdecl *_PtFuncCompare)(const void *,const void *));
 
 #ifndef        NO_OLDNAMES
-  void *__cdecl lfind(const void *_Key,const void *_Base,unsigned int *_NumOfElements,unsigned int _SizeOfElements,int (__cdecl *_PtFuncCompare)(const void *,const void *));
-  void *__cdecl lsearch(const void *_Key,void *_Base,unsigned int *_NumOfElements,unsigned int _SizeOfElements,int (__cdecl *_PtFuncCompare)(const void *,const void *));
+  _CRTIMP void *__cdecl lfind(const void *_Key,const void *_Base,unsigned int *_NumOfElements,unsigned int _SizeOfElements,int (__cdecl *_PtFuncCompare)(const void *,const void *));
+  _CRTIMP void *__cdecl lsearch(const void *_Key,void *_Base,unsigned int *_NumOfElements,unsigned int _SizeOfElements,int (__cdecl *_PtFuncCompare)(const void *,const void *));
 #endif
 
 #ifdef __cplusplus

diff --git a/reactos/include/crt/stdio.h b/reactos/include/crt/stdio.h
index fa845ac..0125112 100644 (file)
--- a/reactos/include/crt/stdio.h
+++ b/reactos/include/crt/stdio.h
@@ -390,16 +390,16 @@ extern "C" {
 #define P_tmpdir _P_tmpdir
 #define SYS_OPEN _SYS_OPEN
 
-  char *__cdecl tempnam(const char *_Directory,const char *_FilePrefix);
-  int __cdecl fcloseall(void);
-  FILE *__cdecl fdopen(int _FileHandle,const char *_Format);
-  int __cdecl fgetchar(void);
-  int __cdecl fileno(FILE *_File);
-  int __cdecl flushall(void);
-  int __cdecl fputchar(int _Ch);
-  int __cdecl getw(FILE *_File);
-  int __cdecl putw(int _Ch,FILE *_File);
-  int __cdecl rmtmp(void);
+  _CRTIMP char *__cdecl tempnam(const char *_Directory,const char *_FilePrefix);
+  _CRTIMP int __cdecl fcloseall(void);
+  _CRTIMP FILE *__cdecl fdopen(int _FileHandle,const char *_Format);
+  _CRTIMP int __cdecl fgetchar(void);
+  _CRTIMP int __cdecl fileno(FILE *_File);
+  _CRTIMP int __cdecl flushall(void);
+  _CRTIMP int __cdecl fputchar(int _Ch);
+  _CRTIMP int __cdecl getw(FILE *_File);
+  _CRTIMP int __cdecl putw(int _Ch,FILE *_File);
+  _CRTIMP int __cdecl rmtmp(void);
 #endif
 
 #ifdef __cplusplus

diff --git a/reactos/include/crt/time.h b/reactos/include/crt/time.h
index d714fa6..d09a8d9 100644 (file)
--- a/reactos/include/crt/time.h
+++ b/reactos/include/crt/time.h
@@ -205,7 +205,7 @@ __CRT_INLINE time_t __cdecl time(time_t *_Time) { return _time64(_Time); }
   _CRTIMP extern int daylight;
   _CRTIMP extern long timezone;
   _CRTIMP extern char *tzname[2];
-  void __cdecl tzset(void);
+  _CRTIMP void __cdecl tzset(void);
 #endif
 
 #ifdef __cplusplus

diff --git a/reactos/include/crt/wchar.h b/reactos/include/crt/wchar.h
index ee79448..c2f30b5 100644 (file)
--- a/reactos/include/crt/wchar.h
+++ b/reactos/include/crt/wchar.h
@@ -220,8 +220,8 @@ extern "C" {
   _CRTIMP int __cdecl _iswcsym_l(wint_t _C,_locale_t _Locale);
   _CRTIMP int __cdecl is_wctype(wint_t _C,wctype_t _Type);
 #if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || !defined (NO_OLDNAMES)
-int __cdecl iswblank(wint_t _C);
-#endif 
+_CRTIMP int __cdecl iswblank(wint_t _C);
+#endif
 #endif
 
 #ifndef _WDIRECT_DEFINED
@@ -714,16 +714,16 @@ int __cdecl iswblank(wint_t _C);
   _CRTIMP int __cdecl _wcsnicoll_l(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount,_locale_t _Locale);
 
 #ifndef        NO_OLDNAMES
-  wchar_t *__cdecl wcsdup(const wchar_t *_Str);
+  _CRTIMP wchar_t *__cdecl wcsdup(const wchar_t *_Str);
 #define wcswcs wcsstr
-  int __cdecl wcsicmp(const wchar_t *_Str1,const wchar_t *_Str2);
-  int __cdecl wcsnicmp(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount);
-  wchar_t *__cdecl wcsnset(wchar_t *_Str,wchar_t _Val,size_t _MaxCount);
-  wchar_t *__cdecl wcsrev(wchar_t *_Str);
-  wchar_t *__cdecl wcsset(wchar_t *_Str,wchar_t _Val);
-  wchar_t *__cdecl wcslwr(wchar_t *_Str);
-  wchar_t *__cdecl wcsupr(wchar_t *_Str);
-  int __cdecl wcsicoll(const wchar_t *_Str1,const wchar_t *_Str2);
+  _CRTIMP int __cdecl wcsicmp(const wchar_t *_Str1,const wchar_t *_Str2);
+  _CRTIMP int __cdecl wcsnicmp(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount);
+  _CRTIMP wchar_t *__cdecl wcsnset(wchar_t *_Str,wchar_t _Val,size_t _MaxCount);
+  _CRTIMP wchar_t *__cdecl wcsrev(wchar_t *_Str);
+  _CRTIMP wchar_t *__cdecl wcsset(wchar_t *_Str,wchar_t _Val);
+  _CRTIMP wchar_t *__cdecl wcslwr(wchar_t *_Str);
+  _CRTIMP wchar_t *__cdecl wcsupr(wchar_t *_Str);
+  _CRTIMP int __cdecl wcsicoll(const wchar_t *_Str1,const wchar_t *_Str2);
 #endif
 #endif