Mercurial > mxe-octave
annotate src/libshout-1-fixes.patch @ 1241:3c3b8b1aaf3d
convert patch format
These were the remaining *-1-fixes.patch that were not in
"git format-patch" format.
author | Mark Brand <mabrand@mabrand.nl> |
---|---|
date | Fri, 01 Oct 2010 18:51:07 +0200 |
parents | 0292c7229519 |
children | f653602a0500 |
rev | line source |
---|---|
798
0292c7229519
new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
1 This file is part of mingw-cross-env. |
0292c7229519
new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
2 See doc/index.html for further information. |
0292c7229519
new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
3 |
1241 | 4 Contains ad hoc patches for cross building. |
5 | |
6 From 25255ff19813e122e6442518b29a55c15860d3a3 Mon Sep 17 00:00:00 2001 | |
7 From: mingw-cross-env | |
8 Date: Fri, 1 Oct 2010 17:20:29 +0200 | |
9 Subject: [PATCH] mingw fixes | |
10 | |
11 | |
12 diff --git a/examples/nonblocking.c b/examples/nonblocking.c | |
13 index 0f4aa68..49a3d36 100644 | |
14 --- a/examples/nonblocking.c | |
15 +++ b/examples/nonblocking.c | |
16 @@ -68,7 +68,11 @@ int main() | |
798
0292c7229519
new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
17 |
0292c7229519
new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
18 while (ret == SHOUTERR_BUSY) { |
0292c7229519
new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
19 printf("Connection pending. Sleeping...\n"); |
0292c7229519
new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
20 +#ifdef __MINGW32__ |
0292c7229519
new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
21 + Sleep(1000); |
0292c7229519
new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
22 +#else |
0292c7229519
new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
23 sleep(1); |
0292c7229519
new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
24 +#endif |
0292c7229519
new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
25 ret = shout_get_connected(shout); |
0292c7229519
new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
26 } |
0292c7229519
new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
27 |
1241 | 28 diff --git a/include/os.h b/include/os.h |
29 index 7d065b3..d7ae425 100755 | |
30 --- a/include/os.h | |
31 +++ b/include/os.h | |
798
0292c7229519
new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
32 @@ -1,7 +1,9 @@ |
0292c7229519
new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
33 #ifdef _WIN32 |
0292c7229519
new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
34 +#ifndef __MINGW32__ |
0292c7229519
new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
35 typedef __int64 int64_t; |
0292c7229519
new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
36 typedef unsigned __int64 uint64_t; |
0292c7229519
new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
37 typedef unsigned __int32 uint32_t; |
0292c7229519
new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
38 typedef __int32 int32_t; |
0292c7229519
new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
39 typedef int ssize_t; |
0292c7229519
new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
40 #endif |
0292c7229519
new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
41 +#endif |
1241 | 42 diff --git a/include/shout/shout.h.in b/include/shout/shout.h.in |
43 index 43b0e7a..b026c10 100644 | |
44 --- a/include/shout/shout.h.in | |
45 +++ b/include/shout/shout.h.in | |
798
0292c7229519
new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
46 @@ -23,8 +23,10 @@ |
0292c7229519
new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
47 |
0292c7229519
new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
48 #include <sys/types.h> |
0292c7229519
new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
49 #ifdef WIN32 |
0292c7229519
new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
50 +#ifndef __MINGW32__ |
0292c7229519
new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
51 #include <os.h> |
0292c7229519
new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
52 #endif |
0292c7229519
new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
53 +#endif |
0292c7229519
new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
54 |
0292c7229519
new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
55 #define SHOUTERR_SUCCESS (0) |
0292c7229519
new packages: liboil, libshout, gstreamer, gst-plugins-base and gst-plugins-good
Mark Brand <mabrand@mabrand.nl>
parents:
diff
changeset
|
56 #define SHOUTERR_INSANE (-1) |
1241 | 57 -- |
58 1.7.1 | |
59 |