[MinGW-cvs] runtime/include _mingw.h,1.14,1.15 tchar.h,1.10,1.11 time.h,1.6,1.7

[<ea...@us...>]

Update of /cvsroot/mingw/runtime/include
In directory sc8-pr-cvs1:/tmp/cvs-serv13351/include

Modified Files:
	_mingw.h tchar.h time.h 
Log Message:
Merge winsup changes

Index: _mingw.h
===================================================================
RCS file: /cvsroot/mingw/runtime/include/_mingw.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** _mingw.h	21 Feb 2003 21:19:51 -0000	1.14
--- _mingw.h	3 May 2003 13:48:46 -0000	1.15
***************
*** 56,60 ****
  # ifdef __declspec
  #  ifndef __MINGW_IMPORT
- 
     /* Note the extern. This is needed to work around GCC's
        limitations in handling dllimport attribute.  */
--- 56,59 ----
***************
*** 62,66 ****
  #  endif
  #  ifndef _CRTIMP
! #   define _CRTIMP  __attribute__((dllimport))
  #  endif
  #  define __DECLSPEC_SUPPORTED
--- 61,69 ----
  #  endif
  #  ifndef _CRTIMP
! #   ifdef __USE_CRTIMP
! #    define _CRTIMP  __attribute__((dllimport))
! #   else  
! #    define _CRTIMP
! #   endif
  #  endif
  #  define __DECLSPEC_SUPPORTED

Index: tchar.h
===================================================================
RCS file: /cvsroot/mingw/runtime/include/tchar.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** tchar.h	12 Nov 2002 15:29:40 -0000	1.10
--- tchar.h	3 May 2003 13:48:46 -0000	1.11
***************
*** 71,75 ****
  
  /*  for porting from other Windows compilers */
! #if 0  // no  wide startup module
  #define _tmain      wmain
  #define _tWinMain   wWinMain
--- 71,75 ----
  
  /*  for porting from other Windows compilers */
! #if 0  /* no  wide startup module */
  #define _tmain      wmain
  #define _tWinMain   wWinMain

Index: time.h
===================================================================
RCS file: /cvsroot/mingw/runtime/include/time.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** time.h	21 Feb 2003 21:19:52 -0000	1.6
--- time.h	3 May 2003 13:48:46 -0000	1.7
***************
*** 126,130 ****
  #endif
  
- _CRTIMP size_t __cdecl	strftime(char*, size_t, const char*, const struct tm*);
  _CRTIMP char* __cdecl	_strdate(char*);
  _CRTIMP char* __cdecl	_strtime(char*);
--- 126,129 ----