Mercurial > gub

comparison patches/guile-1.9.14-mingw-readdir.patch @ 6470:f1b28c608b3a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
guile: never use gnulib's putenv. Fixes env-related bugs such as pango fonts.
author Jan Nieuwenhuizen <janneke@gnu.org>
date Tue, 01 Feb 2011 23:59:39 +0100
parents
children
comparison
equal deleted inserted replaced
6469:f0ee9df1e3f2 6470:f1b28c608b3a
1 --- guile-1.9.14/libguile/win32-dirent.h~ 2010-12-14 19:15:17.000000000 +0100
2 +++ guile-1.9.14/libguile/win32-dirent.h 2011-01-31 16:05:01.703196058 +0100
3 @@ -27,6 +27,14 @@
4
5 #include <sys/types.h>
6
7 +#define opendir guile_opendir
8 +#define readdir guile_readdir
9 +#define closedir guile_closedir
10 +#define rewinddir guile_rewinddir
11 +#define seekdir guile_seekdir
12 +#define telldir guile_telldir
13 +#define dirfd guile_dirfd
14 +
15 struct dirstream
16 {
17 int fd; /* File descriptor. */
18 --- guile-1.9.14/libguile/win32-dirent.c~ 2010-12-14 19:15:17.000000000 +0100
19 +++ guile-1.9.14/libguile/win32-dirent.c 2011-01-31 16:10:06.336659077 +0100
20 @@ -20,14 +20,14 @@
21 # include <config.h>
22 #endif
23
24 +#include "win32-dirent.h"
25 +
26 #include "libguile/__scm.h"
27
28 #include <windows.h>
29 #include <stdio.h>
30 #include <string.h>
31
32 -#include "win32-dirent.h"
33 -
34 DIR *
35 opendir (const char * name)
36 {
37 --- guile-1.9.14/libguile/filesys.c~ 2011-01-30 17:50:22.565848118 +0100
38 +++ guile-1.9.14/libguile/filesys.c 2011-01-31 16:11:02.599078648 +0100
39 @@ -35,6 +35,10 @@
40 #include <stdio.h>
41 #include <errno.h>
42
43 +#if defined (__MINGW32__) || defined (_MSC_VER) || defined (__BORLANDC__)
44 +# include "win32-dirent.h"
45 +#endif /* __MINGW32__ || _MSC_VER || __BORLANDC__ */
46 +
47 #include "libguile/_scm.h"
48 #include "libguile/smob.h"
49 #include "libguile/feature.h"
50 @@ -94,7 +98,6 @@
51
52
53 #if defined (__MINGW32__) || defined (_MSC_VER) || defined (__BORLANDC__)
54 -# include "win32-dirent.h"
55 # define NAMLEN(dirent) strlen((dirent)->d_name)
56 /* The following bits are per AC_HEADER_DIRENT doco in the autoconf manual */
57 #elif HAVE_DIRENT_H