Re: _wine_ldt_copy can not be auto-imported when building under cygwin

[Dimitrie O. Paun]

On January 8, 2003 02:33 am, Jeroen Janssen wrote:
> The attached patch fixes the following problem:
>
> '_wine_ldt_copy' can't be auto-imported" when building under cygwin

Jeroen,
Can you please test if the attach patch work?

Index: include/wine/library.h
===================================================================
RCS file: /var/cvs/wine/include/wine/library.h,v
retrieving revision 1.17
diff -u -r1.17 library.h
--- include/wine/library.h	3 Jan 2003 03:12:58 -0000	1.17
+++ include/wine/library.h	8 Jan 2003 15:00:48 -0000
@@ -72,7 +72,16 @@
 extern int wine_ldt_set_entry( unsigned short sel, const LDT_ENTRY *entry );
 
 /* the local copy of the LDT */
-extern struct __wine_ldt_copy
+#ifdef __CYGWIN__
+# ifdef WINE_EXPORT_LDT_COPY
+#  define WINE_LDT_EXTERN __declspec(dllexport)
+# else
+#  define WINE_LDT_EXTERN __declspec(dllimport)
+#else
+# define WINE_LDT_EXTERN extern
+#endif
+
+WINE_LDT_EXTERN struct __wine_ldt_copy
 {
     void         *base[8192];  /* base address or 0 if entry is free   */
     unsigned long limit[8192]; /* limit in bytes or 0 if entry is free */
Index: library/ldt.c
===================================================================
RCS file: /var/cvs/wine/library/ldt.c,v
retrieving revision 1.5
diff -u -r1.5 ldt.c
--- library/ldt.c	14 Aug 2002 21:10:50 -0000	1.5
+++ library/ldt.c	8 Jan 2003 14:56:31 -0000
@@ -28,6 +28,7 @@
 #include <errno.h>
 
 #include "winbase.h"
+#define WINE_EXPORT_LDT_COPY
 #include "wine/library.h"
 
 #ifdef __i386__


-- 
Dimi.

_wine_ldt_copy can not be auto-imported when building under cygwin

[Jeroen Janssen]

Dimitrie O. Paun wrote:
> On January 8, 2003 02:33 am, Jeroen Janssen wrote:
> > The attached patch fixes the following problem:
> >
> > '_wine_ldt_copy' can't be auto-imported" when building under cygwin
>
> Jeroen,
> Can you please test if the attach patch work?

No, it doesn't work (there was an 'endif' missing).
Attached is the fixed patch.
---
Jeroen Janssen

Index: include/wine/library.h
===================================================================
RCS file: /home/wine/wine/include/wine/library.h,v
retrieving revision 1.17
diff -u -p -r1.17 library.h
--- include/wine/library.h	3 Jan 2003 03:12:58 -0000	1.17
+++ include/wine/library.h	8 Jan 2003 21:49:45 -0000
@@ -72,7 +72,17 @@ extern void wine_ldt_get_entry( unsigned
 extern int wine_ldt_set_entry( unsigned short sel, const LDT_ENTRY *entry );
 
 /* the local copy of the LDT */
-extern struct __wine_ldt_copy
+#ifdef __CYGWIN__
+# ifdef WINE_EXPORT_LDT_COPY
+#  define WINE_LDT_EXTERN __declspec(dllexport)
+# else
+#  define WINE_LDT_EXTERN __declspec(dllimport)
+# endif
+#else
+# define WINE_LDT_EXTERN extern
+#endif
+
+WINE_LDT_EXTERN struct __wine_ldt_copy
 {
     void         *base[8192];  /* base address or 0 if entry is free   */
     unsigned long limit[8192]; /* limit in bytes or 0 if entry is free */
Index: library/ldt.c
===================================================================
RCS file: /home/wine/wine/library/ldt.c,v
retrieving revision 1.5
diff -u -p -r1.5 ldt.c
--- library/ldt.c	14 Aug 2002 21:10:50 -0000	1.5
+++ library/ldt.c	8 Jan 2003 21:49:48 -0000
@@ -28,6 +28,7 @@
 #include <errno.h>
 
 #include "winbase.h"
+#define WINE_EXPORT_LDT_COPY
 #include "wine/library.h"
 
 #ifdef __i386__