Changeset 21710 for branches/gcc-kmk/include/_ras.h

Timestamp:

Oct 18, 2011, 7:37:29 PM (14 years ago)

Author:

dmik

Message:

_ras.h: Use <sys/binutil.h> under GCC and remove useless typedef.

File:

• branches/gcc-kmk/include/_ras.h (modified) (16 diffs)

branches/gcc-kmk/include/_ras.h

@@ -20 +20 @@
                  HMODULE hmod                    /* the custom dll handle */
              );
-             
+
 void WIN32API RasUninitialize (
                   void
@@ -33 +33 @@
                   ULONG cb                       /* size of event specific data */
               );
-              
+
 /* RAS events */
 #define RAS_EVENT_Kernel32InitComplete  (1)
@@ -43 +43 @@
 typedef void WIN32API FNCLF (ULONG h);
 typedef void WIN32API FNWL (ULONG h, char *buf, ULONG buflen);
- 
+
 /* Tracked objects logging functions typedefs */
 typedef void WIN32API FNRASLOG_EXTERNAL (char *fmt, ...);
@@ -68 +68 @@
                   FNCOC *pfnCompareObjectContent  /* custom function to compare two objects */
               );
-              
+
 void WIN32API RasDeregisterObjectTracking (
                   RAS_TRACK_HANDLE h              /* handle previously returned by RasRegisterObjectTracking */
               );
-              
+
 ULONG WIN32API RasAddObject (                     /* returns unique object ident */
                   RAS_TRACK_HANDLE h,             /* handle previously returned by RasRegisterObjectTracking */
@@ -79 +79 @@
                   ULONG cbobjdata                 /* size of object */
               );
-              
+
 void WIN32API RasTrackMemAlloc (
                   RAS_TRACK_HANDLE h,             /* handle previously returned by RasRegisterObjectTracking */
                   ULONG size
               );
-              
+
 void WIN32API RasTrackMemRealloc (
                   RAS_TRACK_HANDLE h,             /* handle previously returned by RasRegisterObjectTracking */
@@ -90 +90 @@
                   ULONG newsize
               );
-              
+
 void WIN32API RasTrackMemFree (
                   RAS_TRACK_HANDLE h,             /* handle previously returned by RasRegisterObjectTracking */
                   ULONG size
               );
-              
+
 void WIN32API RasRemoveObject (
                   RAS_TRACK_HANDLE h,             /* handle previously returned by RasRegisterObjectTracking */
                   ULONG objhandle                 /* distinctive handle of the object */
               );
-              
+
 void WIN32API RasSetObjectUserData (
                   RAS_TRACK_HANDLE h,             /* handle previously returned by RasRegisterObjectTracking */
@@ -108 +108 @@
                   ULONG *pcbdataret               /* returned size of data actually saved */
               );
-              
+
 void WIN32API RasQueryObjectUserData (
                   RAS_TRACK_HANDLE h,             /* handle previously returned by RasRegisterObjectTracking */
@@ -127 +127 @@
 
 /* RAS logging channels */
-typedef struct _RAS_LOG_CHANNEL;
 typedef struct _RAS_LOG_CHANNEL *RAS_LOG_CHANNEL_H;
 
@@ -135 +134 @@
                   const char *filename             /* file name to log to */
               );
-              
+
 void WIN32API RasWriteLogChannel (
                   RAS_LOG_CHANNEL_H hchannel,      /* log channel handle returned by RasOpenLogChannel */
@@ -153 +152 @@
 
 void WIN32API RasLogNoEOL (
-                  char *fmt,                       /* 'printf' style format string */ 
+                  char *fmt,                       /* 'printf' style format string */
                   ...
               );
@@ -162 +161 @@
                   ULONG parm2                      /* message parameter 2 */
               );
-        
+
 #define RAS_FLAG_LOG_OBJECTS (0x1)
 
@@ -178 +177 @@
 void WIN32API RasLogNoEOL2 (
                   RAS_LOG_CHANNEL_H hchannel,      /* log channel to log to */
-                  char *fmt,                       /* 'printf' style format string */ 
+                  char *fmt,                       /* 'printf' style format string */
                   ...
               );
@@ -188 +187 @@
                   ULONG parm2                      /* message parameter 2 */
               );
-        
+
 /* RAS replacement for C runtime sprintf function */
 int WIN32API snprintf (
                   char *buf,                       /* memory buffer for formatted string */
                   int n,                           /* length of memeory buffer */
-                  const char *fmt,                 /* 'printf' style format string */ 
+                  const char *fmt,                 /* 'printf' style format string */
                   ...
              );
-             
+
 /* Tracked object counting function */
 void WIN32API RasCountObjects (
@@ -215 +214 @@
  * any external API (OS/2 and or C runtime functions).
  */
- 
+
 typedef struct _RASCONTEXT
 {
@@ -269 +268 @@
     void  (* WIN32API RasTrackMemFree) (RAS_TRACK_HANDLE h, ULONG size);
     RAS_TRACK_HANDLE (* WIN32API RasGetTrackHandle) (const char *objname);
-              
+
 } RasEntryTable;
 
@@ -286 +285 @@
 
 /* RAS breakpoint support */
+#if defined(__GNUC__)
+#include <sys/builtin.h>
+#else
 #include <builtin.h>
+#endif
 
 #ifdef __cplusplus