Mercurial > gub

annotate patches/guile-1.9.14-mingw-dirent.patch @ 6459:73d419fb8438

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mingw::guile: add dirent patch. Fixes starting up lilypond. libglib-2.0 and libguile-2.0 both export 'readdir'; however guile does not install the matching win32-dirent.h, which has of course a different definition for struct dirent than guile's win32-dirent.h has.
author Jan Nieuwenhuizen <janneke@gnu.org>
date Mon, 31 Jan 2011 16:27:03 +0100
parents
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
6459
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
1 --- guile-1.9.14/libguile/win32-dirent.h~ 2010-12-14 19:15:17.000000000 +0100
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
2 +++ guile-1.9.14/libguile/win32-dirent.h 2011-01-31 16:05:01.703196058 +0100
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
3 @@ -27,6 +27,14 @@
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
4
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
5 #include <sys/types.h>
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
6
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
7 +#define opendir guile_opendir
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
8 +#define readdir guile_readdir
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
9 +#define closedir guile_closedir
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
10 +#define rewinddir guile_rewinddir
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
11 +#define seekdir guile_seekdir
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
12 +#define telldir guile_telldir
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
13 +#define dirfd guile_dirfd
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
14 +
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
15 struct dirstream
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
16 {
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
17 int fd; /* File descriptor. */
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
18 --- guile-1.9.14/libguile/win32-dirent.c~ 2010-12-14 19:15:17.000000000 +0100
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
19 +++ guile-1.9.14/libguile/win32-dirent.c 2011-01-31 16:10:06.336659077 +0100
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
20 @@ -20,14 +20,14 @@
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
21 # include <config.h>
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
22 #endif
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
23
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
24 +#include "win32-dirent.h"
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
25 +
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
26 #include "libguile/__scm.h"
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
27
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
28 #include <windows.h>
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
29 #include <stdio.h>
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
30 #include <string.h>
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
31
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
32 -#include "win32-dirent.h"
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
33 -
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
34 DIR *
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
35 opendir (const char * name)
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
36 {
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
37 --- guile-1.9.14/libguile/filesys.c~ 2011-01-30 17:50:22.565848118 +0100
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
38 +++ guile-1.9.14/libguile/filesys.c 2011-01-31 16:11:02.599078648 +0100
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
39 @@ -35,6 +35,10 @@
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
40 #include <stdio.h>
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
41 #include <errno.h>
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
42
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
43 +#if defined (__MINGW32__) || defined (_MSC_VER) || defined (__BORLANDC__)
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
44 +# include "win32-dirent.h"
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
45 +#endif /* __MINGW32__ || _MSC_VER || __BORLANDC__ */
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
46 +
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
47 #include "libguile/_scm.h"
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
48 #include "libguile/smob.h"
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
49 #include "libguile/feature.h"
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
50 @@ -94,7 +98,6 @@
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
51
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
52
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
53 #if defined (__MINGW32__) || defined (_MSC_VER) || defined (__BORLANDC__)
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
54 -# include "win32-dirent.h"
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
55 # define NAMLEN(dirent) strlen((dirent)->d_name)
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
56 /* The following bits are per AC_HEADER_DIRENT doco in the autoconf manual */
73d419fb8438 mingw::guile: add dirent patch. Fixes starting up lilypond.
Jan Nieuwenhuizen <janneke@gnu.org>
parents:
diff changeset
57 #elif HAVE_DIRENT_H