Changeset 84

Timestamp:

Aug 5, 2017, 10:38:08 PM (8 years ago)

Author:

Gregg Young

Message:

Update some external header files

Location:

trunk

Files:

• h/exceptq.h (modified) (8 diffs)
• widget/xwph/center.h (modified) (1 diff)

trunk/h/exceptq.h ¶

@@ -2 +2 @@
  *
  *  exceptq.h - exceptq public header - v7.12 with SHL modifications
+ *  $Id: exceptq.h,v 1.5 2015/08/30 04:33:59 Steven Exp $
  *
  *  Parts of this file are
- *    Copyright (c) 2000-2013 Steven Levine and Associates, Inc.
+ *    Copyright (c) 2000-2015 Steven Levine and Associates, Inc.
  *    Copyright (c) 2010-2011 Richard L Walsh
  *
@@ -13 +14 @@
  * 2013-12-12 SHL Always include string.h (Dmitriy)
  * 2013-12-12 SHL Declare utility class if INCL_EXCEPTQ_CLASS defined (Dmitriy)
+ * 2015-08-29 SHL Support INCL_EXCEPTQ_INLINE
+ * 2015-08-29 SHL Support VAC, OpenWatcom, gcc C and C++
  *
  *****************************************************************************/
@@ -215 +218 @@
 /*****************************************************************************/
 /*
- * LoadExceptq() is a sample function to load and install Exceptq dynamically
+ * LoadExceptq() is a simple function to load and install Exceptq dynamically
  * so your application can use it without being dependent on its presence.
  * By design, it will fail if it finds a version of Exceptq earlier than v7.0.
- * To use it, #define INCL_LOADEXCEPTQ in *one* of your files to have it
- * included.  It assumes that you have #defined INCL_DOS and #included <os2.h>
- * and <string.h> *before* exceptq.h.
+ * To use it, #define INCL_LOADEXCEPTQ in *only one* of your files to have it
+ * defined or the linker will complain about multiple definitions.
  *
  * LibLoadExceptq() lets a third-party library add Exceptq support to threads
@@ -240 +242 @@
  */
 #if defined(INCL_LOADEXCEPTQ) || defined(INCL_LIBLOADEXCEPTQ)
+#ifdef __cplusplus                     /* 2015-08-29 SHL Dos APIs need this */
+#define XQ_PSZ                         PCSZ
+#else
+#define XQ_PSZ                         PSZ
+#endif
 # ifdef INCL_FORKEXCEPTQ
 #   ifndef __KLIBC_VERSION__
@@ -246 +253 @@
 #   include <dlfcn.h>
 #   define XQ_LOADDLL(name, hndl)      (hndl = dlopen(name, 0))
+#   ifdef __cplusplus                  /* 2015-08-29 SHL Support C++ */
+#   define XQ_GETPROC(hndl, sym, ptr)  (ptr = (typeof ptr)dlsym(hndl, sym))
+#   else
 #   define XQ_GETPROC(hndl, sym, ptr)  (ptr = dlsym(hndl, sym))
+#   endif
 #   define XQ_UNLOADDLL(hndl)          (dlclose(hndl))
 #   define XQ_HMOD                     void*
-# else
-#ifdef __cplusplus
-#   define XQ_LOADDLL(name, hndl)      (DosLoadModule(0, 0, (PCSZ)name, &hndl) == 0)
-#   define XQ_GETPROC(hndl, sym, ptr)  (DosQueryProcAddr(hndl, 0, (PCSZ)sym, (PFN*)&ptr) == 0)
-#else
-#   define XQ_LOADDLL(name, hndl)      (DosLoadModule(0, 0, (PSZ)name, &hndl) == 0)
-#   define XQ_GETPROC(hndl, sym, ptr)  (DosQueryProcAddr(hndl, 0, (PSZ)sym, (PFN*)&ptr) == 0)
-#endif
+# else /* INCL_FORKEXCEPTQ */
+#   define XQ_LOADDLL(name, hndl)      (DosLoadModule(0, 0, (XQ_PSZ)name, &hndl) == 0)
+#   define XQ_GETPROC(hndl, sym, ptr)  (DosQueryProcAddr(hndl, 0, (XQ_PSZ)sym, (PFN*)&ptr) == 0)
 #   define XQ_UNLOADDLL(hndl)          (DosFreeModule(hndl) == 0)
 #   define XQ_HMOD                     HMODULE
 # endif
-#endif
+#endif /* INCL_LOADEXCEPTQ or INCL_LIBLOADEXCEPTQ */
 
 /* 2012-09-30 SHL Always define so that callable from multiple source files */
 #ifndef INCL_LIBLOADEXCEPTQ
-BOOL    LoadExceptq(EXCEPTIONREGISTRATIONRECORD* pExRegRec,
-                    const char* pOpts, const char* pInfo);
+BOOL LoadExceptq(EXCEPTIONREGISTRATIONRECORD* pExRegRec,
+                 const char* pOpts,
+                 const char* pInfo);
 #endif
 
 #ifdef INCL_LOADEXCEPTQ
 
-BOOL    LoadExceptq(EXCEPTIONREGISTRATIONRECORD* pExRegRec,
-                    const char* pOpts, const char* pInfo)
+/* 2015-08-28 SHL declare inline if C++ or INCL_EXECPTQ_INLINE defined */
+#if defined(__cplusplus) || defined(INCL_EXECPTQ_INLINE)
+inline
+#endif
+BOOL LoadExceptq(EXCEPTIONREGISTRATIONRECORD* pExRegRec,
+                 const char* pOpts,
+                 const char* pInfo)
 {
   static BOOL      fLoadTried = FALSE;
@@ -329 +341 @@
 #ifdef INCL_LIBLOADEXCEPTQ
 
-static BOOL   LibLoadExceptq(EXCEPTIONREGISTRATIONRECORD* pExRegRec);
-
-static BOOL   LibLoadExceptq(EXCEPTIONREGISTRATIONRECORD* pExRegRec)
+BOOL LibLoadExceptq(EXCEPTIONREGISTRATIONRECORD* pExRegRec);
+
+/* 2015-08-28 SHL declare inline if C++ or INCL_EXECPTQ_INLINE defined */
+#if defined(__cplusplus) || defined(INCL_EXECPTQ_INLINE)
+inline
+#endif
+BOOL LibLoadExceptq(EXCEPTIONREGISTRATIONRECORD* pExRegRec)
 {
   static BOOL      fLoadTried = FALSE;
@@ -352 +368 @@
 
     strcpy(szPath, "EXCEPTQ");
-    if (DosQueryModuleHandle(szPath, (HMODULE*)&hmod)) {
+    /* 2015-08-29 SHL Support C++ */
+    if (DosQueryModuleHandle((XQ_PSZ)szPath, (HMODULE*)&hmod)) {
       PPIB      ppib;
       PTIB      ptib;
@@ -363 +380 @@
 
       strcpy(&ptr[1], "EXCEPTQ.DLL");
-      if (DosQueryModuleHandle(szPath, (HMODULE*)&hmod))
+      /* 2015-08-29 SHL Support C++ */
+      if (DosQueryModuleHandle((XQ_PSZ)szPath, (HMODULE*)&hmod))
         return FALSE;
     }

trunk/widget/xwph/center.h ¶

@@ -21 +21 @@
 
 /*
- *      Copyright (C) 2000-2002 Ulrich M”ller.
+ *      Copyright (C) 2000-2003 Ulrich M”ller,
+ *                              Martin Lafaix.
+ *
  *      This file is part of the XWorkplace source package.
- *      XWorkplace is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published
- *      by the Free Software Foundation, in version 2 as it comes in the
- *      "COPYING" file of the XWorkplace main distribution.
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
+ *      Even though XWorkplace is free software under the GNU General
+ *      Public License version 2 (GPL), permission is granted, free
+ *      of charge, to use this file for the purpose of creating software
+ *      that integrates into XWorkplace or eComStation, even if that
+ *      software is not published under the GPL.
+ *
+ *      This permission  extends to this single file only, but NOT to
+ *      other files of the XWorkplace sources, not even those that
+ *      are based on or include this file.
+ *
+ *      As a special exception to the GPL, using this file for the
+ *      purpose of creating software that integrates into XWorkplace
+ *      or eComStation is not considered creating a derivative work
+ *      in the sense of the GPL. In plain English, you are not bound
+ *      to the terms and conditions of the GPL if you use only this
+ *      file for that purpose. You are bound by the GPL however if
+ *      you incorporate code from GPL'ed XWorkplace source files where
+ *      this notice is not present.
+ *
+ *      This file is distributed in the hope that it will be useful,
+ *      but still WITHOUT ANY WARRANTY; without even the implied
+ *      warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *      In no event shall the authors and/or copyright holders be
+ *      liable for any damages or other claims arising from the use
+ *      of this software.
  */