diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-08-26 23:43:45 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-08-26 23:43:45 +0100 |
| commit | 3e79dae5454d1c29cf865847a77a285ca8f7dc14 (patch) | |
| tree | 5b4778c6b223586dd027f23b6475274676d69a6c /dep | |
| parent | 97c3e2e6c105e3dd563ba1064e86f5503d3f22f6 (diff) | |
| parent | 30e41724e43c9669d10771836eebd79743c56518 (diff) | |
Merge remote-tracking branch 'origin/master' into mmaps
Diffstat (limited to 'dep')
| -rw-r--r-- | dep/g3dlite/G3D-v8.0_extra.diff | 12 | ||||
| -rw-r--r-- | dep/g3dlite/include/G3D/GMutex.h | 1 |
2 files changed, 13 insertions, 0 deletions
diff --git a/dep/g3dlite/G3D-v8.0_extra.diff b/dep/g3dlite/G3D-v8.0_extra.diff new file mode 100644 index 00000000000..d556103c96d --- /dev/null +++ b/dep/g3dlite/G3D-v8.0_extra.diff @@ -0,0 +1,12 @@ +diff --git a/dep/g3dlite/include/G3D/GMutex.h b/dep/g3dlite/include/G3D/GMutex.h +index 3469b81..9fe098d 100644 +--- a/dep/g3dlite/include/G3D/GMutex.h ++++ b/dep/g3dlite/include/G3D/GMutex.h +@@ -16,6 +16,7 @@ + #ifndef G3D_WIN32 + # include <pthread.h> + # include <signal.h> ++# include <unistd.h> + #endif + + diff --git a/dep/g3dlite/include/G3D/GMutex.h b/dep/g3dlite/include/G3D/GMutex.h index 3469b812736..9fe098d10e3 100644 --- a/dep/g3dlite/include/G3D/GMutex.h +++ b/dep/g3dlite/include/G3D/GMutex.h @@ -16,6 +16,7 @@ #ifndef G3D_WIN32 # include <pthread.h> # include <signal.h> +# include <unistd.h> #endif |