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

Merge branch gcc-kmk to trunk.

Location:
trunk
Files:
2 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/include/new.h

    r1678 r21916  
    1212#define _new_h_
    1313
     14#ifdef __IBMC__
    1415/* check for IBMCPP new.h */
    1516#ifdef __new_h
    … …  
    2324    typedef  unsigned int size_t;
    2425#endif
     26#endif
     27
     28#ifdef __GNUC__
     29#include <stddef.h>
     30#endif
    2531
    2632#ifndef __DEBUG_ALLOC__
    2733/* The standard favourites */
    2834void *operator new(size_t size);
    29 void *operator new(size_t size, void *location);  /* stub */
     35void *operator new(size_t size, void *location) throw();    /* stub */
    3036
    31 void *operator new[](size_t size);                /* stub */
    32 void *operator new[](size_t size, void *location);/* stub */
     37void *operator new[](size_t size) throw();                  /* stub */
     38void *operator new[](size_t size, void *location) throw();  /* stub */
    3339
    3440void operator delete(void *location);
    35 void operator delete[](void *location);           /* stub */
     41void operator delete[](void *location) throw();             /* stub */
    3642#endif
    3743
Note: See TracChangeset for help on using the changeset viewer.