Mercurial > mxe-octave
annotate src/pthreads-1-fixes.patch @ 3725:2acaa9943159
qscintilla: update 2.8.4
* src/qscintilla.mk: update to version and checksum for 2.8.4
author | John Donoghue |
---|---|
date | Mon, 20 Oct 2014 11:01:00 -0400 |
parents | e911d2fa403b |
children |
rev | line source |
---|---|
2559 | 1 This file is part of MXE. |
2 See index.html for further information. | |
3 | |
2560
e911d2fa403b
package pthreads: more linking convenience
Mark Brand <mabrand@mabrand.nl>
parents:
2559
diff
changeset
|
4 From e951f784c852f4cd8298864190936fded1efceba Mon Sep 17 00:00:00 2001 |
2559 | 5 From: Mark Brand <mabrand@mabrand.nl> |
6 Date: Sun, 27 May 2012 22:00:19 +0200 | |
7 Subject: [PATCH] force static for convenience | |
8 | |
9 --- | |
2560
e911d2fa403b
package pthreads: more linking convenience
Mark Brand <mabrand@mabrand.nl>
parents:
2559
diff
changeset
|
10 pthread.h | 4 ++++ |
e911d2fa403b
package pthreads: more linking convenience
Mark Brand <mabrand@mabrand.nl>
parents:
2559
diff
changeset
|
11 sched.h | 4 ++++ |
e911d2fa403b
package pthreads: more linking convenience
Mark Brand <mabrand@mabrand.nl>
parents:
2559
diff
changeset
|
12 semaphore.h | 4 ++++ |
e911d2fa403b
package pthreads: more linking convenience
Mark Brand <mabrand@mabrand.nl>
parents:
2559
diff
changeset
|
13 3 files changed, 12 insertions(+) |
2559 | 14 |
15 diff --git a/pthread.h b/pthread.h | |
16 index b4072f7..c88c886 100755 | |
17 --- a/pthread.h | |
18 +++ b/pthread.h | |
19 @@ -547,6 +547,10 @@ extern "C" | |
20 * do NOT define PTW32_BUILD, and then the variables/functions will | |
21 * be imported correctly. | |
22 */ | |
23 + | |
24 +// MXE: Set this for convenience here since MXE only does static. | |
25 +#define PTW32_STATIC_LIB | |
26 + | |
27 #if !defined(PTW32_STATIC_LIB) | |
28 # if defined(PTW32_BUILD) | |
29 # define PTW32_DLLPORT __declspec (dllexport) | |
2560
e911d2fa403b
package pthreads: more linking convenience
Mark Brand <mabrand@mabrand.nl>
parents:
2559
diff
changeset
|
30 diff --git a/sched.h b/sched.h |
e911d2fa403b
package pthreads: more linking convenience
Mark Brand <mabrand@mabrand.nl>
parents:
2559
diff
changeset
|
31 index f36a97a..1f4f401 100755 |
e911d2fa403b
package pthreads: more linking convenience
Mark Brand <mabrand@mabrand.nl>
parents:
2559
diff
changeset
|
32 --- a/sched.h |
e911d2fa403b
package pthreads: more linking convenience
Mark Brand <mabrand@mabrand.nl>
parents:
2559
diff
changeset
|
33 +++ b/sched.h |
e911d2fa403b
package pthreads: more linking convenience
Mark Brand <mabrand@mabrand.nl>
parents:
2559
diff
changeset
|
34 @@ -76,6 +76,10 @@ |
e911d2fa403b
package pthreads: more linking convenience
Mark Brand <mabrand@mabrand.nl>
parents:
2559
diff
changeset
|
35 * do NOT define PTW32_BUILD, and then the variables/functions will |
e911d2fa403b
package pthreads: more linking convenience
Mark Brand <mabrand@mabrand.nl>
parents:
2559
diff
changeset
|
36 * be imported correctly. |
e911d2fa403b
package pthreads: more linking convenience
Mark Brand <mabrand@mabrand.nl>
parents:
2559
diff
changeset
|
37 */ |
e911d2fa403b
package pthreads: more linking convenience
Mark Brand <mabrand@mabrand.nl>
parents:
2559
diff
changeset
|
38 + |
e911d2fa403b
package pthreads: more linking convenience
Mark Brand <mabrand@mabrand.nl>
parents:
2559
diff
changeset
|
39 +// MXE: Set this for convenience here since MXE only does static. |
e911d2fa403b
package pthreads: more linking convenience
Mark Brand <mabrand@mabrand.nl>
parents:
2559
diff
changeset
|
40 +#define PTW32_STATIC_LIB |
e911d2fa403b
package pthreads: more linking convenience
Mark Brand <mabrand@mabrand.nl>
parents:
2559
diff
changeset
|
41 + |
e911d2fa403b
package pthreads: more linking convenience
Mark Brand <mabrand@mabrand.nl>
parents:
2559
diff
changeset
|
42 #if !defined(PTW32_STATIC_LIB) |
e911d2fa403b
package pthreads: more linking convenience
Mark Brand <mabrand@mabrand.nl>
parents:
2559
diff
changeset
|
43 # if defined(PTW32_BUILD) |
e911d2fa403b
package pthreads: more linking convenience
Mark Brand <mabrand@mabrand.nl>
parents:
2559
diff
changeset
|
44 # define PTW32_DLLPORT __declspec (dllexport) |
e911d2fa403b
package pthreads: more linking convenience
Mark Brand <mabrand@mabrand.nl>
parents:
2559
diff
changeset
|
45 diff --git a/semaphore.h b/semaphore.h |
e911d2fa403b
package pthreads: more linking convenience
Mark Brand <mabrand@mabrand.nl>
parents:
2559
diff
changeset
|
46 index c6e9407..2b64173 100755 |
e911d2fa403b
package pthreads: more linking convenience
Mark Brand <mabrand@mabrand.nl>
parents:
2559
diff
changeset
|
47 --- a/semaphore.h |
e911d2fa403b
package pthreads: more linking convenience
Mark Brand <mabrand@mabrand.nl>
parents:
2559
diff
changeset
|
48 +++ b/semaphore.h |
e911d2fa403b
package pthreads: more linking convenience
Mark Brand <mabrand@mabrand.nl>
parents:
2559
diff
changeset
|
49 @@ -75,6 +75,10 @@ |
e911d2fa403b
package pthreads: more linking convenience
Mark Brand <mabrand@mabrand.nl>
parents:
2559
diff
changeset
|
50 * do NOT define PTW32_BUILD, and then the variables/functions will |
e911d2fa403b
package pthreads: more linking convenience
Mark Brand <mabrand@mabrand.nl>
parents:
2559
diff
changeset
|
51 * be imported correctly. |
e911d2fa403b
package pthreads: more linking convenience
Mark Brand <mabrand@mabrand.nl>
parents:
2559
diff
changeset
|
52 */ |
e911d2fa403b
package pthreads: more linking convenience
Mark Brand <mabrand@mabrand.nl>
parents:
2559
diff
changeset
|
53 + |
e911d2fa403b
package pthreads: more linking convenience
Mark Brand <mabrand@mabrand.nl>
parents:
2559
diff
changeset
|
54 +// MXE: Set this for convenience here since MXE only does static. |
e911d2fa403b
package pthreads: more linking convenience
Mark Brand <mabrand@mabrand.nl>
parents:
2559
diff
changeset
|
55 +#define PTW32_STATIC_LIB |
e911d2fa403b
package pthreads: more linking convenience
Mark Brand <mabrand@mabrand.nl>
parents:
2559
diff
changeset
|
56 + |
e911d2fa403b
package pthreads: more linking convenience
Mark Brand <mabrand@mabrand.nl>
parents:
2559
diff
changeset
|
57 #if !defined(PTW32_STATIC_LIB) |
e911d2fa403b
package pthreads: more linking convenience
Mark Brand <mabrand@mabrand.nl>
parents:
2559
diff
changeset
|
58 # if defined(PTW32_BUILD) |
e911d2fa403b
package pthreads: more linking convenience
Mark Brand <mabrand@mabrand.nl>
parents:
2559
diff
changeset
|
59 # define PTW32_DLLPORT __declspec (dllexport) |
2559 | 60 -- |
61 1.7.9.2 | |
62 |