summaryrefslogtreecommitdiff
path: root/common/JackShmMem.h
diff options
context:
space:
mode:
authorsletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224>2008-06-05 12:19:36 +0000
committersletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224>2008-06-05 12:19:36 +0000
commit9484fcc3087eb3213ea8298badcd3ba100348c00 (patch)
tree4f68c6c23c96d6f9f8d53168818ba989d12a4abc /common/JackShmMem.h
parent0ed0c4d91ea20e56e7b647de6502153e0df03dde (diff)
downloadjack2-9484fcc3087eb3213ea8298badcd3ba100348c00.tar.gz
Compiles on Windows again
git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2458 0c269be4-1314-0410-8aa9-9f06e86f4224
Diffstat (limited to 'common/JackShmMem.h')
-rw-r--r--common/JackShmMem.h17
1 files changed, 9 insertions, 8 deletions
diff --git a/common/JackShmMem.h b/common/JackShmMem.h
index 6c327f7a..9f673ab6 100644
--- a/common/JackShmMem.h
+++ b/common/JackShmMem.h
@@ -23,6 +23,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include "shm.h"
#include "JackError.h"
+#include "JackExports.h"
#include <new> // GCC 4.0
#include <errno.h>
@@ -46,8 +47,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
namespace Jack
{
-void LockMemoryImp(void* ptr, size_t size);
-void UnlockMemoryImp(void* ptr, size_t size);
+EXPORT void LockMemoryImp(void* ptr, size_t size);
+EXPORT void UnlockMemoryImp(void* ptr, size_t size);
class JackMem
{
@@ -93,28 +94,28 @@ class JackMem
A class which objects need to be allocated in shared memory derives from this class.
*/
-class JackShmMem
+class EXPORT JackShmMem
{
protected:
jack_shm_info_t fInfo;
- static unsigned int fSegmentNum;
- static jack_shm_info_t gInfo;
-
+
public:
void* operator new(size_t size);
void* operator new(size_t size, void* memory);
void operator delete(void* p, size_t size);
- void operator delete(void* p);
+ void operator delete(void* p);
- JackShmMem()
+ JackShmMem();
+ /*
{
fInfo.index = gInfo.index;
fInfo.attached_at = gInfo.attached_at;
fInfo.size = gInfo.size;
}
+ */
virtual ~JackShmMem()
{}