Changeset 3870 for trunk


Ignore:
Timestamp:
Jun 27, 2014, 1:30:25 PM (11 years ago)
Author:
bird
Message:

Made the locale bits compile with watcom.

Location:
trunk/libc
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/libc/include/unidef.h

    r2823 r3870  
    3535#endif
    3636#ifndef APIENTRY
    37 # ifdef _System
     37# if defined (__WATCOMC__)
     38#  define APIENTRY __syscall
     39# elif defined(_System) || defined (__IBMC__) || defined (__IBMCPP__)
    3840#  define APIENTRY _System
    3941# else

  • trunk/libc/src/libc/locale/os2/setlocale.c

    r3860 r3870  
    504504
    505505static inline unsigned char Transform(LocaleObject lobj, UconvObject uobj,
    506                                       UniChar (* APIENTRY pfnTransFunc) (LocaleObject, UniChar),
     506                                      UniChar (APIENTRY *pfnTransFunc) (const LocaleObject, UniChar),
    507507                                      UniChar uc, unsigned char uchFallback)
    508508{
    … …  
    12121212                    ULONG       cb;
    12131213                    int         rc;
    1214                     FS_VAR()
     1214                    FS_VAR();
    12151215
    12161216                    FS_SAVE_LOAD();
    … …  
    13001300            ULONG   cb;
    13011301            int     rc;
    1302             FS_VAR()
     1302            FS_VAR();
    13031303
    13041304            FS_SAVE_LOAD();
Note: See TracChangeset for help on using the changeset viewer.