summaryrefslogtreecommitdiffstats
path: root/src/guile-1-win32.patch
blob: 92de511d33b0ae321e4d3839baace36a651647da (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
This file is part of MXE.
See index.html for further information.

diff -ruN guile-1.8.7.orig/configure guile-1.8.7/configure
--- guile-1.8.7.orig/configure	2009-07-05 22:25:00.000000000 +0200
+++ guile-1.8.7/configure	2010-04-10 07:35:25.000000000 +0200
@@ -35057,6 +35057,7 @@
 $as_echo_n "checking whether pthread_attr_getstack works for the main thread... " >&6; }
 old_CFLAGS="$CFLAGS"
 CFLAGS="$PTHREAD_CFLAGS $CFLAGS"
+if test "$cross_compiling" = "no"; then
 if test "$cross_compiling" = yes; then
   { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -35140,6 +35141,9 @@
 fi
 
 
+else
+works=no
+fi
 CFLAGS="$old_CFLAGS"
 { $as_echo "$as_me:$LINENO: result: $works" >&5
 $as_echo "$works" >&6; }
diff -ruN guile-1.8.7.orig/guile-readline/configure guile-1.8.7/guile-readline/configure
--- guile-1.8.7.orig/guile-readline/configure	2009-07-05 22:24:45.000000000 +0200
+++ guile-1.8.7/guile-readline/configure	2010-04-10 07:36:18.000000000 +0200
@@ -12353,7 +12353,7 @@
 fi
 
 
-for termlib in ncurses curses termcap terminfo termlib ; do
+for termlib in ncurses curses termcap terminfo termlib pdcurses ; do
    as_ac_Lib=`$as_echo "ac_cv_lib_${termlib}''_tgoto" | $as_tr_sh`
 { $as_echo "$as_me:$LINENO: checking for tgoto in -l${termlib}" >&5
 $as_echo_n "checking for tgoto in -l${termlib}... " >&6; }
diff -ruN guile-1.8.7.orig/libguile/__scm.h guile-1.8.7/libguile/__scm.h
--- guile-1.8.7.orig/libguile/__scm.h	2009-07-04 00:18:59.000000000 +0200
+++ guile-1.8.7/libguile/__scm.h	2010-04-10 07:58:48.000000000 +0200
@@ -150,7 +150,7 @@
    which should be exported or imported in the resulting dynamic link
    library (DLL) in the Win32 port. */
 
-#if defined (SCM_IMPORT)
+#if defined (SCM_IMPORT) && defined (USE_DLL_IMPORT)
 # define SCM_API __declspec (dllimport) extern
 #elif defined (SCM_EXPORT) || defined (DLL_EXPORT)
 # define SCM_API __declspec (dllexport) extern