[Xorg-commit] xc/lib/Xaw Vendor.c,1.1.4.1,1.1.4.1.2.1

[Alexander Gottwald]

Committed by: ago

Update of /cvs/xorg/xc/lib/Xaw
In directory pdx:/tmp/cvs-serv3597/Xaw

Modified Files:
      Tag: CYGWIN
	Vendor.c 
Log Message:
Import changes from xoncygwin

Index: Vendor.c
===================================================================
RCS file: /cvs/xorg/xc/lib/Xaw/Vendor.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.1.2.1
diff -u -d -r1.1.4.1 -r1.1.4.1.2.1
--- Vendor.c	17 Nov 2003 19:03:41 -0000	1.1.4.1
+++ Vendor.c	11 Dec 2003 19:37:33 -0000	1.1.4.1.2.1
@@ -111,11 +111,13 @@
  *
  ***************************************************************************/
 
-#ifdef __UNIXOS2__
+#if defined(__UNIXOS2__) || defined(__CYGWIN__) 
 /* to fix the EditRes problem because of wrong linker semantics */
 extern WidgetClass vendorShellWidgetClass; /* from Xt/Vendor.c */
 extern VendorShellClassRec _XawVendorShellClassRec;
 extern void _XawFixupVendorShell();
+
+#if defined(__UNIXOS2__)
 unsigned long _DLL_InitTerm(unsigned long mod,unsigned long flag)
 {
 	switch (flag) {
@@ -130,6 +132,25 @@
 		return 0;
 	}
 }
+#endif
+
+#if defined(__CYGWIN__)
+int __stdcall
+DllMain(unsigned long mod_handle, unsigned long flag, void *routine)
+{
+  switch (flag)
+    {
+    case 1: /* DLL_PROCESS_ATTACH - process attach */
+      vendorShellWidgetClass = (WidgetClass)(&_XawVendorShellClassRec);
+      _XawFixupVendorShell();
+      break;
+    case 0: /* DLL_PROCESS_DETACH - process detach */
+      break;
+    }
+  return 1;
+}
+#endif
+
 #define vendorShellClassRec _XawVendorShellClassRec
 
 #endif
@@ -337,7 +358,7 @@
     }
 }
 
-#if defined(__osf__) || defined(__UNIXOS2__)
+#if defined(__osf__) || defined(__UNIXOS2__) || defined(__CYGWIN__)
 /* stupid OSF/1 shared libraries have the wrong semantics */
 /* symbols do not get resolved external to the shared library */
 void _XawFixupVendorShell()