Changeset 21916 for trunk/include/exceptions.h

Timestamp:

Dec 18, 2011, 10:28:22 PM (14 years ago)

Author:

dmik

Message:

Merge branch gcc-kmk to trunk.

Location:

trunk

Files:

• . (modified) (2 props)
• include/exceptions.h (modified) (6 diffs)

trunk

@@ -1 @@
-bin
-Makefile.inc
+env.cmd
+LocalConfig.kmk

@@ -1 @@
-bin
-Makefile.inc
+env.cmd
+LocalConfig.kmk

trunk/include/exceptions.h

@@ -18 +18 @@
  * Exception codes
  */
- 
+
 #define STATUS_SUCCESS                   0x00000000
 #define STATUS_WAIT_0                    0x00000000
@@ -25 +25 @@
 #define STATUS_TIMEOUT                   0x00000102
 #define STATUS_PENDING                   0x00000103
-#define STATUS_GUARD_PAGE_VIOLATION      0x80000001    
+#define STATUS_GUARD_PAGE_VIOLATION      0x80000001
 #define STATUS_DATATYPE_MISALIGNMENT     0x80000002
 #define STATUS_BREAKPOINT                0x80000003
@@ -89 +89 @@
 #define WINCONTEXT_i386      0x00010000
 #define WINCONTEXT_i486      WINCONTEXT_i386
-#define WINCONTEXT_CONTROL   (WINCONTEXT_i386 | 0x0001) 
-#define WINCONTEXT_INTEGER   (WINCONTEXT_i386 | 0x0002) 
-#define WINCONTEXT_SEGMENTS  (WINCONTEXT_i386 | 0x0004) 
-#define WINCONTEXT_FLOATING_POINT  (WINCONTEXT_i386 | 0x0008L) 
-#define WINCONTEXT_DEBUG_REGISTERS (WINCONTEXT_i386 | 0x0010L) 
+#define WINCONTEXT_CONTROL   (WINCONTEXT_i386 | 0x0001)
+#define WINCONTEXT_INTEGER   (WINCONTEXT_i386 | 0x0002)
+#define WINCONTEXT_SEGMENTS  (WINCONTEXT_i386 | 0x0004)
+#define WINCONTEXT_FLOATING_POINT  (WINCONTEXT_i386 | 0x0008L)
+#define WINCONTEXT_DEBUG_REGISTERS (WINCONTEXT_i386 | 0x0010L)
 #define WINCONTEXT_FULL (WINCONTEXT_CONTROL | WINCONTEXT_INTEGER | WINCONTEXT_SEGMENTS)
 
@@ -145 +145 @@
 
 
-#define WINEXCEPTION_NONCONTINUABLE     0x1    
-#define WINEXCEPTION_MAXIMUM_PARAMETERS 15     
+#define WINEXCEPTION_NONCONTINUABLE     0x1
+#define WINEXCEPTION_MAXIMUM_PARAMETERS 15
 
 typedef struct _WINEXCEPTION_RECORD {
@@ -197 +197 @@
  * Return values from filters in except() and from UnhandledExceptionFilter
  */
- 
+
 #define WINEXCEPTION_EXECUTE_HANDLER        1
 #define WINEXCEPTION_CONTINUE_SEARCH        0
@@ -206 +206 @@
 #pragma pack()
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 DWORD RtlDispatchException(WINEXCEPTION_RECORD *pRecord, WINCONTEXT *pContext);
 
+#ifdef __cplusplus
+} // extern "C"
 #endif
+
+#endif

@@ -1 @@
-bin
-Makefile.inc
+env.cmd
+LocalConfig.kmk