diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-17 19:03:42 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-17 19:03:42 +0000 |
| commit | a6bdd56c5b098599942e4091ae7e2af2d4631b44 (patch) | |
| tree | e0a23167aca0fb1127f4cd78edf458b633b31eac /src/Vendor.c | |
| parent | 6a13c9e08bb042c81ae904c44a38a50d785c824e (diff) | |
merge XFree86 4.3.0.1 to -CURRENT
Diffstat (limited to 'src/Vendor.c')
| -rw-r--r-- | src/Vendor.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/src/Vendor.c b/src/Vendor.c index 4123ddc..3b282dc 100644 --- a/src/Vendor.c +++ b/src/Vendor.c @@ -46,6 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ +/* $XFree86: xc/lib/Xt/Vendor.c,v 1.7 2002/05/31 18:45:46 dawes Exp $ */ /* Make sure all wm properties can make it out of the resource manager */ @@ -63,6 +64,24 @@ SOFTWARE. * ***************************************************************************/ +#ifdef __UNIXOS2__ +/* to fix the EditRes problem because of wrong linker semantics */ +extern WidgetClass vendorShellWidgetClass; +unsigned long _DLL_InitTerm(unsigned long mod,unsigned long flag) +{ + switch (flag) { + case 0: /*called on init*/ + _CRT_init(); + vendorShellWidgetClass = (WidgetClass)(&vendorShellClassRec); + return 1; + case 1: /*called on exit*/ + return 1; + default: + return 0; + } +} +#endif + externaldef(vendorshellclassrec) VendorShellClassRec vendorShellClassRec = { { /* superclass */ (WidgetClass) &wmShellClassRec, |