diff options
| author | Max Horn | 2009-02-21 21:16:41 +0000 |
|---|---|---|
| committer | Max Horn | 2009-02-21 21:16:41 +0000 |
| commit | ff17899d8ef0a9bf82334819444646b4c323b29e (patch) | |
| tree | 06289cbe5b36c014ea52dc2eb376431d6fc2c9ba /engines/sci/scicore/sci_memory.cpp | |
| parent | 2acb44d1574abb831c99e11f52f6f956d40b6d8b (diff) | |
| download | scummvm-rg350-ff17899d8ef0a9bf82334819444646b4c323b29e.tar.gz scummvm-rg350-ff17899d8ef0a9bf82334819444646b4c323b29e.tar.bz2 scummvm-rg350-ff17899d8ef0a9bf82334819444646b4c323b29e.zip | |
SCI: Got rid of include/scitypes.h
svn-id: r38746
Diffstat (limited to 'engines/sci/scicore/sci_memory.cpp')
| -rw-r--r-- | engines/sci/scicore/sci_memory.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/sci/scicore/sci_memory.cpp b/engines/sci/scicore/sci_memory.cpp index 2b27a1c3c7..446c1bb1a9 100644 --- a/engines/sci/scicore/sci_memory.cpp +++ b/engines/sci/scicore/sci_memory.cpp @@ -87,20 +87,20 @@ char *sci_strndup(const char *src, size_t length) { //-------- Refcounting ---------- -#define REFCOUNT_OVERHEAD (sizeof(guint32) * 3) +#define REFCOUNT_OVERHEAD (sizeof(uint32) * 3) #define REFCOUNT_MAGIC_LIVE_1 0xebdc1741 #define REFCOUNT_MAGIC_LIVE_2 0x17015ac9 #define REFCOUNT_MAGIC_DEAD_1 0x11dead11 #define REFCOUNT_MAGIC_DEAD_2 0x22dead22 -#define REFCOUNT_CHECK(p) ((((guint32 *)(p))[-3] == REFCOUNT_MAGIC_LIVE_2) && (((guint32 *)(p))[-1] == REFCOUNT_MAGIC_LIVE_1)) +#define REFCOUNT_CHECK(p) ((((uint32 *)(p))[-3] == REFCOUNT_MAGIC_LIVE_2) && (((uint32 *)(p))[-1] == REFCOUNT_MAGIC_LIVE_1)) -#define REFCOUNT(p) (((guint32 *)p)[-2]) +#define REFCOUNT(p) (((uint32 *)p)[-2]) #undef TRACE_REFCOUNT extern void *sci_refcount_alloc(size_t length) { - guint32 *data = (guint32 *)sci_malloc(REFCOUNT_OVERHEAD + length); + uint32 *data = (uint32 *)sci_malloc(REFCOUNT_OVERHEAD + length); #ifdef TRACE_REFCOUNT fprintf(stderr, "[] REF: Real-alloc at %p\n", data); #endif @@ -136,7 +136,7 @@ extern void sci_refcount_decref(void *data) { if (!REFCOUNT_CHECK(data)) { BREAKPOINT(); } else if (--REFCOUNT(data) == 0) { - guint32 *fdata = (guint32 *)data; + uint32 *fdata = (uint32 *)data; fdata[-1] = REFCOUNT_MAGIC_DEAD_1; fdata[-3] = REFCOUNT_MAGIC_DEAD_2; |