Changeset 141

Timestamp:

Oct 24, 2006, 12:40:32 AM (19 years ago)

Author:

dmik

Message:

Compiling: Fixed broken release builds by appliying a better workaround for the Innotek GCC compiler bug related to attribute((system)) processing (see ​http://svn.netlabs.org/libc/ticket/129 for more details).

File:

• trunk/include/qt_os2.h (modified) (1 diff)

trunk/include/qt_os2.h

@@ -77 +77 @@
     static ERR libcHandler;
 
-    static ULONG APIENTRY handler( PEXCEPTIONREPORTRECORD pReportRec,
-                                   PEXCEPTIONREGISTRATIONRECORD pRegRec,
-                                   PCONTEXTRECORD pContextRec,
-                                   PVOID pv );
+    // @todo (r=dmik) Inntotek GCC/kLIBC v0.6.1 and earlier have a problem with
+    // __attribute__((__system__)) (see http://svn.netlabs.org/libc/ticket/129)
+    // so we have to temporarily comment out APIENTRY below, based on the fact
+    // that the OS/2 _System calling convention corresponds to cdecl in terms
+    // of argument order and stack cleanup. Once it's fixed, this should be
+    // guarded by #if __INNOTEK_LIBC__<=0x006...
+    static ULONG /* APIENTRY */ handler( PEXCEPTIONREPORTRECORD pReportRec,
+                                         PEXCEPTIONREGISTRATIONRECORD pRegRec,
+                                         PCONTEXTRECORD pContextRec,
+                                         PVOID pv );
 
     friend class QtOS2SysXcptMainHandlerInternal;
     friend class QThreadInstance;
 
-    // these are private to allow only stack-based instances    
+    // these are private to allow stack-based instances only    
     QtOS2SysXcptMainHandler( QtOS2SysXcptMainHandler &/*that*/ ) {}
     QtOS2SysXcptMainHandler &operator =( QtOS2SysXcptMainHandler &/*that*/) {