Ignore:
Timestamp:
Jan 6, 2003, 2:24:23 PM (23 years ago)
Author:
sandervl
Message:

PF: header updates

Location:
trunk/include/win/msvcrt/sys
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/win/msvcrt/sys/stat.h

    r8207 r9631  
    1010#define __WINE_USE_MSVCRT
    1111
    12 #include "msvcrt/sys/types.h"
     12#include "sys/types.h"
    1313
     14#ifndef MSVCRT
     15# ifdef USE_MSVCRT_PREFIX
     16#  define MSVCRT(x)    MSVCRT_##x
     17# else
     18#  define MSVCRT(x)    x
     19# endif
     20#endif
     21
     22#ifndef MSVCRT_WCHAR_T_DEFINED
     23#define MSVCRT_WCHAR_T_DEFINED
     24#ifndef __cplusplus
     25typedef unsigned short MSVCRT(wchar_t);
     26#endif
     27#endif
     28
     29#ifndef _MSC_VER
     30# ifndef __int64
     31#  define __int64 long long
     32# endif
     33#endif
     34
     35#ifndef MSVCRT_DEV_T_DEFINED
     36typedef unsigned int   _dev_t;
     37#define MSVCRT_DEV_T_DEFINED
     38#endif
     39
     40#ifndef MSVCRT_INO_T_DEFINED
     41typedef unsigned short _ino_t;
     42#define MSVCRT_INO_T_DEFINED
     43#endif
     44
     45#ifndef MSVCRT_TIME_T_DEFINED
     46typedef long MSVCRT(time_t);
     47#define MSVCRT_TIME_T_DEFINED
     48#endif
     49
     50#ifndef MSVCRT_OFF_T_DEFINED
     51typedef int MSVCRT(_off_t);
     52#define MSVCRT_OFF_T_DEFINED
     53#endif
    1454
    1555#define _S_IEXEC  0x0040
    … …  
    2262#define _S_IFMT   0xF000
    2363
     64/* for FreeBSD */
     65#undef st_atime
     66#undef st_ctime
     67#undef st_mtime
     68
     69#ifndef MSVCRT_STAT_DEFINED
     70#define MSVCRT_STAT_DEFINED
    2471
    2572struct _stat {
    … …  
    3178  short          st_gid;
    3279  _dev_t         st_rdev;
    33   _off_t        st_size;
     80  MSVCRT(_off_t) st_size;
    3481  MSVCRT(time_t) st_atime;
    3582  MSVCRT(time_t) st_mtime;
    … …  
    5097  MSVCRT(time_t) st_ctime;
    5198};
    52 
     99#endif /* MSVCRT_STAT_DEFINED */
    53100
    54101#ifdef __cplusplus
    … …  
    56103#endif
    57104
    58 int _fstat(int,struct _stat*);
     105int MSVCRT(_fstat)(int,struct _stat*);
     106int MSVCRT(_stat)(const char*,struct _stat*);
    59107int _fstati64(int,struct _stati64*);
    60 int _stat(const char*,struct _stat*);
    61108int _stati64(const char*,struct _stati64*);
    62109
    63 int _wstat(const WCHAR*,struct _stat*);
    64 int _wstati64(const WCHAR*,struct _stati64*);
     110#ifndef MSVCRT_WSTAT_DEFINED
     111#define MSVCRT_WSTAT_DEFINED
     112int _wstat(const MSVCRT(wchar_t)*,struct _stat*);
     113int _wstati64(const MSVCRT(wchar_t)*,struct _stati64*);
     114#endif /* MSVCRT_WSTAT_DEFINED */
    65115
    66116#ifdef __cplusplus

  • trunk/include/win/msvcrt/sys/timeb.h

    r8207 r9631  
    2222#define __WINE_USE_MSVCRT
    2323
    24 #include "msvcrt/sys/types.h"      /* For time_t */
     24#ifndef MSVCRT
     25# ifdef USE_MSVCRT_PREFIX
     26#  define MSVCRT(x)    MSVCRT_##x
     27# else
     28#  define MSVCRT(x)    x
     29# endif
     30#endif
    2531
     32#ifndef MSVCRT_TIME_T_DEFINED
     33typedef long MSVCRT(time_t);
     34#define MSVCRT_TIME_T_DEFINED
     35#endif
    2636
     37#ifndef MSVCRT_TIMEB_DEFINED
     38#define MSVCRT_TIMEB_DEFINED
    2739struct _timeb
    2840{
    … …  
    3244    short          dstflag;
    3345};
     46#endif /* MSVCRT_TIMEB_DEFINED */
    3447
    3548

  • trunk/include/win/msvcrt/sys/types.h

    r8207 r9631  
    2222#define __WINE_USE_MSVCRT
    2323
    24 
    25 #ifdef USE_MSVCRT_PREFIX
    26 #define MSVCRT(x)    MSVCRT_##x
    27 #else
    28 #define MSVCRT(x)    x
     24#ifndef MSVCRT
     25# ifdef USE_MSVCRT_PREFIX
     26#  define MSVCRT(x)    MSVCRT_##x
     27# else
     28#  define MSVCRT(x)    x
     29# endif
    2930#endif
    3031
     32#ifndef MSVCRT_DEV_T_DEFINED
     33typedef unsigned int   _dev_t;
     34#define MSVCRT_DEV_T_DEFINED
     35#endif
    3136
    32 typedef unsigned int   _dev_t;
     37#ifndef MSVCRT_INO_T_DEFINED
    3338typedef unsigned short _ino_t;
    34 typedef int            _off_t;
    35 typedef long           MSVCRT(time_t);
     39#define MSVCRT_INO_T_DEFINED
     40#endif
     41
     42#ifndef MSVCRT_OFF_T_DEFINED
     43typedef int MSVCRT(_off_t);
     44#define MSVCRT_OFF_T_DEFINED
     45#endif
     46
     47#ifndef MSVCRT_TIME_T_DEFINED
     48typedef long MSVCRT(time_t);
     49#define MSVCRT_TIME_T_DEFINED
     50#endif
    3651
    3752

  • trunk/include/win/msvcrt/sys/utime.h

    r8207 r9631  
    2222#define __WINE_USE_MSVCRT
    2323
    24 #include "winnt.h"
    25 #include "msvcrt/sys/types.h"      /* For time_t */
     24#ifndef MSVCRT
     25# ifdef USE_MSVCRT_PREFIX
     26#  define MSVCRT(x)    MSVCRT_##x
     27# else
     28#  define MSVCRT(x)    x
     29# endif
     30#endif
    2631
     32#ifndef MSVCRT_WCHAR_T_DEFINED
     33#define MSVCRT_WCHAR_T_DEFINED
     34#ifndef __cplusplus
     35typedef unsigned short MSVCRT(wchar_t);
     36#endif
     37#endif
    2738
     39#ifndef MSVCRT_TIME_T_DEFINED
     40typedef long MSVCRT(time_t);
     41#define MSVCRT_TIME_T_DEFINED
     42#endif
     43
     44#ifndef MSVCRT_UTIMBUF_DEFINED
     45#define MSVCRT_UTIMBUF_DEFINED
    2846struct _utimbuf
    2947{
    … …  
    3149    MSVCRT(time_t) modtime;
    3250};
    33 
     51#endif /* MSVCRT_UTIMBUF_DEFINED */
    3452
    3553#ifdef __cplusplus
    … …  
    4058int         _utime(const char*,struct _utimbuf*);
    4159
    42 int         _wutime(const WCHAR*,struct _utimbuf*);
     60int         _wutime(const MSVCRT(wchar_t)*,struct _utimbuf*);
    4361
    4462#ifdef __cplusplus
Note: See TracChangeset for help on using the changeset viewer.