Changeset 21916 for trunk/src/win32k/include
- Timestamp:
- Dec 18, 2011, 10:28:22 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 7 edited
-
. (modified) (2 props)
-
src/win32k/include/ModuleBase.h (modified) (1 diff)
-
src/win32k/include/OS2KLDR.h (modified) (2 diffs)
-
src/win32k/include/asmutils.h (modified) (1 diff)
-
src/win32k/include/new.h (modified) (2 diffs)
-
src/win32k/include/sprintf.h (modified) (1 diff)
-
src/win32k/include/vprintf.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:ignore
-
old new 1 bin 2 Makefile.inc 1 env.cmd 2 LocalConfig.kmk
-
-
Property svn:mergeinfo
set to
/branches/gcc-kmk merged eligible
- Property svn:ignore
-
trunk/src/win32k/include/ModuleBase.h
r5093 r21916 55 55 */ 56 56 #define printIPE(a) (ModuleBase::ulInfoLevel >= ModuleBase::Error ? \ 57 ModuleBase::printf("\nerror(%d: "__FUNCTION__"): !Internal Processing Error!\n\t", __LINE__), \57 ModuleBase::printf("\nerror(%d:%s): !Internal Processing Error!\n\t", __LINE__, __FUNCTION__), \ 58 58 ModuleBase::printf a, \ 59 59 ModuleBase::printf("\n") \ 60 60 : (void)0,(void)0,(void)0 ) 61 61 #define printErr(a) (ModuleBase::ulInfoLevel >= ModuleBase::Error ? \ 62 ModuleBase::printf("error(%d: "__FUNCTION__"): ", __LINE__), \62 ModuleBase::printf("error(%d:%s: ", __LINE__, __FUNCTION__), \ 63 63 ModuleBase::printf a \ 64 64 : (void)0,(void)0 ) 65 65 #define printWar(a) (ModuleBase::ulInfoLevel >= ModuleBase::Warning ? \ 66 ModuleBase::printf("warning( "__FUNCTION__"): "), \66 ModuleBase::printf("warning(%s): ", __FUNCTION__), \ 67 67 ModuleBase::printf a \ 68 68 : (void)0,(void)0 ) -
trunk/src/win32k/include/OS2KLDR.h
r6229 r21916 36 36 37 37 /* ote_flags */ 38 #if ndef __EXE386__38 #if !defined(__EXE386__) && !defined(_LXexe_h_) 39 39 #define OBJREAD 0x00000001L /* Readable Object */ 40 40 #define OBJWRITE 0x00000002L /* Writeable Object */ … … 47 47 #endif 48 48 #define OBJZEROFIL 0x00000100L /* Object has zero-filled pages */ 49 #if ndef __EXE386__49 #if !defined(__EXE386__) && !defined(_LXexe_h_) 50 50 #define OBJRESIDENT 0x00000200L /* Object is resident */ 51 51 #define OBJCONTIG 0x00000300L /* Object is resident and contiguous */ -
trunk/src/win32k/include/asmutils.h
r2511 r21916 29 29 extern int _System Int3(void); 30 30 #else 31 #ifdef __GNUC__ 32 #define _Inline static inline 33 #define __interrupt(n) ({ __asm__ __volatile__ ("int" #n "\n\tnop"); }) 34 #else 31 35 #include <builtin.h> 36 #endif 32 37 #define Int3() __interrupt(3) 33 38 #endif -
trunk/src/win32k/include/new.h
r1678 r21916 12 12 #define _new_h_ 13 13 14 #ifdef __IBMC__ 14 15 /* check for IBMCPP new.h */ 15 16 #ifdef __new_h … … 23 24 typedef unsigned int size_t; 24 25 #endif 26 #endif 27 28 #ifdef __GNUC__ 29 #include <stddef.h> 30 #endif 25 31 26 32 #ifndef __DEBUG_ALLOC__ 27 33 /* The standard favourites */ 28 34 void *operator new(size_t size); 29 void *operator new(size_t size, void *location) ;/* stub */35 void *operator new(size_t size, void *location) throw(); /* stub */ 30 36 31 void *operator new[](size_t size) ;/* stub */32 void *operator new[](size_t size, void *location) ;/* stub */37 void *operator new[](size_t size) throw(); /* stub */ 38 void *operator new[](size_t size, void *location) throw(); /* stub */ 33 39 34 40 void operator delete(void *location); 35 void operator delete[](void *location) ;/* stub */41 void operator delete[](void *location) throw(); /* stub */ 36 42 #endif 37 43 -
trunk/src/win32k/include/sprintf.h
r1678 r21916 31 31 */ 32 32 #undef va_start 33 #ifdef __GNUC__ 34 #define __nextword(base) (((unsigned)(sizeof(base))+3U)&~(3U)) 35 #endif 33 36 #define va_start(ap, last) ap = ((va_list)SSToDS(&last)) + __nextword(last) 34 37 -
trunk/src/win32k/include/vprintf.h
r1678 r21916 32 32 */ 33 33 #undef va_start 34 #ifdef __GNUC__ 35 #define __nextword(base) (((unsigned)(sizeof(base))+3U)&~(3U)) 36 #endif 34 37 #define va_start(ap, last) ap = ((va_list)SSToDS(&last)) + __nextword(last) 35 38
Note:
See TracChangeset
for help on using the changeset viewer.
