Mercurial > mxe-octave

annotate src/libshout-1-fixes.patch @ 2537:2de591821f11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
package libshout: restore needed mingw fix
author Mark Brand <mabrand@mabrand.nl>
date Sun, 20 May 2012 23:28:16 +0200
parents
children f79b2ad2be45
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2537
2de591821f11 package libshout: restore needed mingw fix
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
1 This file is part of MXE.
2de591821f11 package libshout: restore needed mingw fix
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
2 See index.html for further information.
2de591821f11 package libshout: restore needed mingw fix
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
3
2de591821f11 package libshout: restore needed mingw fix
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
4 Contains ad hoc patches for cross building.
2de591821f11 package libshout: restore needed mingw fix
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
5
2de591821f11 package libshout: restore needed mingw fix
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
6 From b05b2d82333e13f637dffb93f821907f775eb585 Mon Sep 17 00:00:00 2001
2de591821f11 package libshout: restore needed mingw fix
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
7 From: Mark Brand <mabrand@mabrand.nl>
2de591821f11 package libshout: restore needed mingw fix
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
8 Date: Sun, 20 May 2012 23:23:37 +0200
2de591821f11 package libshout: restore needed mingw fix
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
9 Subject: [PATCH] mingw fixes
2de591821f11 package libshout: restore needed mingw fix
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
10
2de591821f11 package libshout: restore needed mingw fix
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
11 ---
2de591821f11 package libshout: restore needed mingw fix
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
12 include/shout/shout.h.in | 2 ++
2de591821f11 package libshout: restore needed mingw fix
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
13 1 file changed, 2 insertions(+)
2de591821f11 package libshout: restore needed mingw fix
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
14
2de591821f11 package libshout: restore needed mingw fix
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
15 diff --git a/include/shout/shout.h.in b/include/shout/shout.h.in
2de591821f11 package libshout: restore needed mingw fix
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
16 index 682ad49..f412cdc 100644
2de591821f11 package libshout: restore needed mingw fix
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
17 --- a/include/shout/shout.h.in
2de591821f11 package libshout: restore needed mingw fix
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
18 +++ b/include/shout/shout.h.in
2de591821f11 package libshout: restore needed mingw fix
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
19 @@ -23,8 +23,10 @@
2de591821f11 package libshout: restore needed mingw fix
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
20
2de591821f11 package libshout: restore needed mingw fix
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
21 #include <sys/types.h>
2de591821f11 package libshout: restore needed mingw fix
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
22 #ifdef WIN32
2de591821f11 package libshout: restore needed mingw fix
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
23 +#ifndef __MINGW32__
2de591821f11 package libshout: restore needed mingw fix
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
24 #include <os.h>
2de591821f11 package libshout: restore needed mingw fix
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
25 #endif
2de591821f11 package libshout: restore needed mingw fix
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
26 +#endif
2de591821f11 package libshout: restore needed mingw fix
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
27
2de591821f11 package libshout: restore needed mingw fix
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
28 #define SHOUTERR_SUCCESS (0)
2de591821f11 package libshout: restore needed mingw fix
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
29 #define SHOUTERR_INSANE (-1)
2de591821f11 package libshout: restore needed mingw fix
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
30 --
2de591821f11 package libshout: restore needed mingw fix
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
31 1.7.9.2
2de591821f11 package libshout: restore needed mingw fix
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
32