Ignore:
Timestamp:
Dec 18, 2011, 10:28:22 PM (14 years ago)
Author:
dmik
Message:

Merge branch gcc-kmk to trunk.

Location:
trunk
Files:
1 deleted
4 edited

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore

      •  

        old new  
        1 bin
        2 Makefile.inc
         1env.cmd
         2LocalConfig.kmk
    • Property svn:mergeinfo set to
      /branches/gcc-kmkmergedeligible

  • trunk/src/win32k/misc/avl.c

    r4164 r21916  
    3333#include "string.h"
    3434
     35#ifdef __GNUC__
     36#define _Inline static inline
     37#define __interrupt(n) ({ __asm__ __volatile__ ("int" #n "\n\tnop"); })
     38#else
    3539#include <builtin.h>
     40#endif
    3641#define assert(a) ((a) ? (void)0 : __interrupt(3))
    3742

  • trunk/src/win32k/misc/new.cpp

    r4164 r21916  
    4242 * stub
    4343 */
    44 void *operator new(size_t size, void *location)
     44void *operator new(size_t size, void *location) throw()
    4545{
    4646    dprintf(("operator new(size,location) not implemented\n"));
    … …  
    5252 * stub
    5353 */
    54 void *operator new[](size_t size)
     54void *operator new[](size_t size) throw()
    5555{
    5656    dprintf(("operator new[](size) not implemented\n"));
    … …  
    6262 * stub
    6363 */
    64 void *operator new[](size_t size, void *location)
     64void *operator new[](size_t size, void *location) throw()
    6565{
    6666    dprintf(("operator new[](size,location) not implemented\n"));
    … …  
    8282 * stub
    8383 */
    84 void operator delete[](void *location)
     84void operator delete[](void *location) throw()
    8585{
    8686    dprintf(("operator delete[](location) - not implemented\n"));
    … …  
    106106 * stub
    107107 */
    108 void *operator new(size_t size, const char *filename, size_t lineno, void *location)
     108void *operator new(size_t size, const char *filename, size_t lineno, void *location) throw()
    109109{
    110110    dprintf(("operator new(size,location) not implemented\n"));
    … …  
    116116 * stub
    117117 */
    118 void *operator new[](size_t size, const char *filename, size_t lineno)
     118void *operator new[](size_t size, const char *filename, size_t lineno) throw()
    119119{
    120120    dprintf(("operator new[](size) not implemented\n"));
    … …  
    126126 * stub
    127127 */
    128 void *operator new[](size_t size, const char *filename, size_t lineno, void *location)
     128void *operator new[](size_t size, const char *filename, size_t lineno, void *location) throw()
    129129{
    130130    dprintf(("operator new[](size,location) not implemented\n"));

  • trunk/src/win32k/misc/vprintf.c

    r5298 r21916  
    395395                    lValue = va_arg(args, signed long);
    396396                else if (chArgSize == 'h')
     397#ifdef __GNUC__
     398                    // shut up stupid warning and avoid stupid abort()
     399                    lValue = va_arg(args, int);
     400#else
    397401                    lValue = va_arg(args, signed short);
     402#endif
    398403                else
    399404                    lValue = va_arg(args, signed int);
Note: See TracChangeset for help on using the changeset viewer.