summaryrefslogtreecommitdiff
path: root/src/gallium/auxiliary/util/u_memory.h
diff options
context:
space:
mode:
authorJosé Fonseca <jrfonseca@tungstengraphics.com>2008-08-31 17:40:08 +0900
committerJosé Fonseca <jrfonseca@tungstengraphics.com>2008-08-31 17:40:08 +0900
commitef823dd543e1d98da98d188c53c8fc3285924364 (patch)
tree21c67a816c728972c4cd317e2e5156aaebe4cb18 /src/gallium/auxiliary/util/u_memory.h
parent8156c30a5d2d9504cd156b009545f5514f2628ed (diff)
util: Fix compiler errors in the release build of C++ sources.
Diffstat (limited to 'src/gallium/auxiliary/util/u_memory.h')
-rw-r--r--src/gallium/auxiliary/util/u_memory.h13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/gallium/auxiliary/util/u_memory.h b/src/gallium/auxiliary/util/u_memory.h
index 8fbbb4e55d..857102719d 100644
--- a/src/gallium/auxiliary/util/u_memory.h
+++ b/src/gallium/auxiliary/util/u_memory.h
@@ -39,7 +39,12 @@
#include "pipe/p_debug.h"
- /* Define ENOMEM for WINCE */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* Define ENOMEM for WINCE */
#if (_WIN32_WCE < 600)
#ifndef ENOMEM
#define ENOMEM 12
@@ -47,7 +52,6 @@
#endif
-
#if defined(PIPE_SUBSYSTEM_WINDOWS_DISPLAY) && defined(DEBUG)
/* memory debugging */
@@ -220,4 +224,9 @@ mem_dup(const void *src, uint size)
+#ifdef __cplusplus
+}
+#endif
+
+
#endif /* U_MEMORY_H */