Changeset 21352 for trunk/include


Ignore:
Timestamp:
Feb 21, 2010, 5:28:20 PM (16 years ago)
Author:
rlwalsh
Message:

eliminate VACPP warning & info msgs - see Ticket #1

Location:
trunk/include
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/incl_vac/STDIO.H

    r9707 r21352  
    141141   #define clearerr   CRTWRAP(clearerr) 
    142142   #define fclose   CRTWRAP(fclose) 
     143   #define fdopen   CRTWRAP(fdopen) 
    143144   #define feof   CRTWRAP(feof) 
    144145   #define ferror   CRTWRAP(ferror) 
    … …  
    326327
    327328     #if (defined(__IBMC__) || defined(__IBMCPP__))
     329     /*RLW - this ensures fdopen() will be remapped to odin_fdopen()
     330             except when we explicitly want the unwrapped version */
     331     #ifdef ORIGINAL_VAC_FUNCTIONS
    328332      #pragma map( fdopen  , "_fdopen"   )
     333     #endif
    329334      #pragma map( fgetchar, "_fgetchar" )
    330335      #pragma map( fileno  , "_fileno"   )

  • trunk/include/incl_vac/STDLIB.H

    r9707 r21352  
    364364         void  _Builtin __disable( void );
    365365
    366          #define _enable( )  __enable( )
    367          #define _disable( ) __disable( )
     366/*RLW - these are also defined in <builtin.h> which is usually
     367  included after <stdlib.h> - this generates lots of warnings.
     368          #define _enable( )  __enable( )
     369          #define _disable( ) __disable( )
     370*/
    368371        #endif
    369372
    … …  
    445448         unsigned char  _Builtin  __crotl(unsigned char, int);
    446449         unsigned char  _Builtin  __crotr(unsigned char, int);
     450
     451/*RLW - these are also defined in <builtin.h> which is usually
     452  included after <stdlib.h> - this generates lots of warnings.
    447453         #define  _rotl( x, y )   __lrotl( (x), (y) )
    448454         #define  _rotr( x, y )   __lrotr( (x), (y) )
    … …  
    453459         #define  _crotl( x, y )  __crotl( (x), (y) )
    454460         #define  _crotr( x, y )  __crotr( (x), (y) )
     461*/
    455462       #else
    456463         unsigned int   _rotl (unsigned int, int);

  • trunk/include/odin32.post.vac3.mk

    r10301 r21352  
    145145    eautil $@ nul /s
    146146    $(LXLITE) $@
     147!else
     148!if defined(NO_LXLITE)
     149    eautil $@ nul /s
     150!endif
    147151!endif
    148152!endif
    … …  
    221225    eautil $@ nul /s
    222226    $(LXLITE) $@
     227!else
     228!if defined(NO_LXLITE)
     229    eautil $@ nul /s
     230!endif
    223231!endif
    224232!endif

  • trunk/include/win/debugstr.h

    r10004 r21352  
    1212#define debugstr_w(a) debugstr_wn(a, 80)
    1313#else
    14 #define debugstr_a(a) a
    15 #define debugstr_w(a) a
     14#define debugstr_a(a) ""
     15#define debugstr_w(a) ""
    1616#endif
    1717

  • trunk/include/win/debugtools.h

    r21301 r21352  
    343343}
    344344#else
    345 #define debugstr_guid(a) 0
     345#define debugstr_guid(a) ""
     346#define debugstr_an(a,n) ""
     347#define debugstr_wn(w,n) ""
    346348#endif
    347349

  • trunk/include/win/unistd.h

    r6508 r21352  
    33
    44#endif
     5

  • trunk/include/win/windef.h

    r21301 r21352  
    254254typedef double          DWORDLONG;
    255255#elif defined (__EMX__)
     256#ifndef _INT64_T_DECLARED
    256257typedef long long                 int64_t; /* LONGLONG */
    257258typedef unsigned long long      u_int64_t; /* LONGLONG */
     259#endif
     260#ifndef _UINT64_T_DECLARED
    258261typedef unsigned long long       uint64_t; /* LONGLONG */
     262#endif
    259263typedef int64_t         LONGLONG;
    260264typedef uint64_t        ULONGLONG;

  • trunk/include/win/wine/unicode.h

    r21307 r21352  
    9999extern _K32CONV int snprintfW( WCHAR *str, unsigned int len, const WCHAR *format, ... );
    100100extern _K32CONV int vsnprintfW( WCHAR *str, unsigned int len, const WCHAR *format, va_list valist );
     101/*RLW*/
     102extern _K32CONV int sprintfW( WCHAR *str, const WCHAR *format, ...);
    101103
    102104static inline int is_dbcs_leadbyte( const union cptable *table, unsigned char ch )

  • trunk/include/win/winnt.h

    r21327 r21352  
    11961196#define STATUS_NO_EAS_ON_FILE            0xC0000052
    11971197#define STATUS_EA_CORRUPT_ERROR          0xC0000053
    1198 #define STATUS_LOCK_NOT_GRANTED          0xC0000054  /* FIXME: not sure */
    1199 #define STATUS_FILE_LOCK_CONFLICT        0xC0000055  /* FIXME: not sure */
     1198#define STATUS_FILE_LOCK_CONFLICT        0xC0000054
     1199#define STATUS_LOCK_NOT_GRANTED          0xC0000055
    12001200#define STATUS_DELETE_PENDING            0xC0000056
    12011201#define STATUS_CTL_FILE_NOT_SUPPORTED    0xC0000057
    … …  
    18931893#else /* __WINE__ */
    18941894#define NtCurrentTeb GetThreadTEB
    1895 struct _TEB  *WINAPI GetThreadTEB();
     1895struct _TEB  *WINAPI GetThreadTEB(void);
    18961896#endif
    18971897#endif //__WIN32OS2__

  • trunk/include/wprocess.h

    r10294 r21352  
    6666
    6767#define NtCurrentTeb GetThreadTEB
    68 TEB  *WIN32API GetThreadTEB();
     68TEB  *WIN32API GetThreadTEB(void);
    6969TEB  *WIN32API GetTEBFromThreadId(ULONG threadId);
    7070TEB  *WIN32API GetTEBFromThreadHandle(HANDLE hThread);
Note: See TracChangeset for help on using the changeset viewer.