summaryrefslogtreecommitdiffstats
path: root/src/gallium/include/pipe/p_util.h
diff options
context:
space:
mode:
authorJosé Fonseca <[email protected]>2008-02-25 20:05:41 +0900
committerJosé Fonseca <[email protected]>2008-02-25 20:05:41 +0900
commite4e30089231831339815cccebf3a3a0ea6dcd2a9 (patch)
tree66a4b0da649d0814312b6464a129ec895ae012f1 /src/gallium/include/pipe/p_util.h
parentc8b069cc1e839b5dd7a11d33c291b6b587a45df3 (diff)
Make the pipe headers C++ friendly.
Diffstat (limited to 'src/gallium/include/pipe/p_util.h')
-rw-r--r--src/gallium/include/pipe/p_util.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/gallium/include/pipe/p_util.h b/src/gallium/include/pipe/p_util.h
index 6f0dbdacd91..3b32ba1d248 100644
--- a/src/gallium/include/pipe/p_util.h
+++ b/src/gallium/include/pipe/p_util.h
@@ -34,13 +34,13 @@
#include <math.h>
-#ifdef WIN32
-
#ifdef __cplusplus
-extern "C"
-{
+extern "C" {
#endif
+
+#ifdef WIN32
+
void * __stdcall
EngAllocMem(
unsigned long Flags,
@@ -51,10 +51,6 @@ void __stdcall
EngFreeMem(
void *Mem );
-#ifdef __cplusplus
-}
-#endif
-
static INLINE void *
MALLOC( unsigned size )
{
@@ -379,4 +375,8 @@ extern void pipe_copy_rect(ubyte * dst, unsigned cpp, unsigned dst_pitch,
int src_pitch, unsigned src_x, int src_y);
+#ifdef __cplusplus
+}
+#endif
+
#endif