talloc: fixes for Mac

aras-p · Aug 4, 2010 · ceee99e · ceee99e
1 parent d163ef6
commit ceee99e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/glsl/msvc/talloc/talloc.c b/src/glsl/msvc/talloc/talloc.c
@@ -37,6 +37,8 @@
 #define TALLOC_MIN(a,b) ((a)<(b)?(a):(b))
 #ifdef _MSC_VER
 typedef size_t ssize_t;
+#endif
+#ifdef __cplusplus
 extern "C" {
 #endif
 
@@ -1220,6 +1222,6 @@ int talloc_is_parent(const void *context, const void *ptr)
 	return 0;
 }
 
-#ifdef _MSC_VER
+#ifdef __cplusplus
 }
 #endif
diff --git a/src/glsl/msvc/talloc/talloc.h b/src/glsl/msvc/talloc/talloc.h
@@ -29,7 +29,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 
-#ifdef _MSC_VER
+#ifdef __cplusplus
 extern "C" {
 #endif
 
@@ -123,7 +123,7 @@ char *talloc_vasprintf_append(char *s, const char *fmt, va_list ap) PRINTF_ATTRI
 char *talloc_asprintf(const void *t, const char *fmt, ...) PRINTF_ATTRIBUTE(2,3);
 char *talloc_asprintf_append(char *s, const char *fmt, ...) PRINTF_ATTRIBUTE(2,3);
 
-#ifdef _MSC_VER
+#ifdef __cplusplus
 }
 #endif