diff options
| author | McCabe Maxsted | 2010-09-07 18:01:44 -0700 |
|---|---|---|
| committer | Armin Weatherwax | 2010-09-23 15:38:30 +0200 |
| commit | 092fda55d8537e7655a545634e443c6c6c3dde0b (patch) | |
| tree | 608feb0cf51cf5b704628ad1256b7f5bd4458093 /linden/indra/llplugin | |
| parent | Removed some bad merge entries from newview/CMakeLists.txt (diff) | |
| download | meta-impy-092fda55d8537e7655a545634e443c6c6c3dde0b.zip meta-impy-092fda55d8537e7655a545634e443c6c6c3dde0b.tar.gz meta-impy-092fda55d8537e7655a545634e443c6c6c3dde0b.tar.bz2 meta-impy-092fda55d8537e7655a545634e443c6c6c3dde0b.tar.xz | |
Added fix for word size from Snowglobe (only for Windows--didn't update Linux or Mac as I can't test them)
Diffstat (limited to 'linden/indra/llplugin')
| -rw-r--r-- | linden/indra/llplugin/llpluginsharedmemory.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/linden/indra/llplugin/llpluginsharedmemory.cpp b/linden/indra/llplugin/llpluginsharedmemory.cpp index 2be4648..c946619 100644 --- a/linden/indra/llplugin/llpluginsharedmemory.cpp +++ b/linden/indra/llplugin/llpluginsharedmemory.cpp | |||
| @@ -34,6 +34,13 @@ | |||
| 34 | 34 | ||
| 35 | #include "llpluginsharedmemory.h" | 35 | #include "llpluginsharedmemory.h" |
| 36 | 36 | ||
| 37 | #if LL_WINDOWS | ||
| 38 | #include <process.h> | ||
| 39 | #else // LL_WINDOWS | ||
| 40 | #include <sys/types.h> | ||
| 41 | #include <unistd.h> | ||
| 42 | #endif // LL_WINDOWS | ||
| 43 | |||
| 37 | // on Mac and Linux, we use the native shm_open/mmap interface by using | 44 | // on Mac and Linux, we use the native shm_open/mmap interface by using |
| 38 | // #define USE_SHM_OPEN_SHARED_MEMORY 1 | 45 | // #define USE_SHM_OPEN_SHARED_MEMORY 1 |
| 39 | // in the appropriate sections below. | 46 | // in the appropriate sections below. |