1 files changed, 14 insertions, 6 deletions
diff --git a/src/gallium/include/pipe/p_winsys.h b/src/gallium/include/pipe/p_winsys.h
index 1e81eebd782..e784c92491b 100644
--- a/src/gallium/include/pipe/p_winsys.h
+++ b/src/gallium/include/pipe/p_winsys.h
@@ -25,12 +25,6 @@
  * 
  **************************************************************************/
 
-#ifndef P_WINSYS_H
-#define P_WINSYS_H
-
-
-#include "p_format.h"
-
 /**
  * \file
  * This is the interface that Gallium3D requires any window system
@@ -38,6 +32,17 @@
  * which is public.
  */
 
+#ifndef P_WINSYS_H
+#define P_WINSYS_H
+
+
+#include "p_format.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 
 /** Opaque type */
 struct pipe_fence_handle;
@@ -156,5 +161,8 @@ struct pipe_winsys
 };
 
 
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* P_WINSYS_H */