summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2004-04-09 17:18:22 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2004-04-09 17:18:22 +0000
commit5eb921382ff378de224ddddf0f66321eb773a38c (patch)
tree1befd2565e698e5e7a390c4bd6d0c3ba877e3ef5 /include
parentfb31a01f879610341b4000921ce395a0ce97d053 (diff)
added extern "C" for C++ (bug 930933)
Diffstat (limited to 'include')
-rw-r--r--include/GL/miniglx.h16
1 files changed, 12 insertions, 4 deletions
diff --git a/include/GL/miniglx.h b/include/GL/miniglx.h
index 8c246a05cf..41e2093628 100644
--- a/include/GL/miniglx.h
+++ b/include/GL/miniglx.h
@@ -1,10 +1,8 @@
-/* $Id: miniglx.h,v 1.3 2004/03/24 15:59:44 brianp Exp $ */
-
/*
* Mesa 3-D graphics library
- * Version: 5.0
+ * Version: 6.1
*
- * Copyright (C) 1999-2002 Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-2004 Brian Paul All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -39,6 +37,12 @@
#include <GL/gl.h>
#include <stdlib.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
/**
* \name Replacement Xlib/GLX types
*/
@@ -439,4 +443,8 @@ glXGetVisualFromFBConfig( Display *dpy, GLXFBConfig config );
/*@}*/
+#ifdef __cplusplus
+}
+#endif
+
#endif /* MINIGLX_H */