[Mesa-dev] [PATCH 2/2] glapi/hgl: Drop extern "C" as it was added to glapi

Alexander von Gluck IV kallisti5 at unixzen.com
Wed May 13 11:25:23 PDT 2015


---
 src/hgl/GLDispatcher.cpp |    5 +++--
 src/hgl/GLDispatcher.h   |    4 +---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/hgl/GLDispatcher.cpp b/src/hgl/GLDispatcher.cpp
index 46b91d5..a1e9053 100644
--- a/src/hgl/GLDispatcher.cpp
+++ b/src/hgl/GLDispatcher.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
- * Copyright 2000-2012 Haiku, Inc. All Rights Reserved.
+ * Copyright 2000-2015 Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -10,10 +10,11 @@
  */
 
 
-extern "C" {
 #include "glapi/glapi.h"
 #include "glapi/glapi_priv.h"
 
+
+extern "C" {
 /*
  * NOTE: this file portion implements C-based dispatch of the OpenGL entrypoints
  * (glAccum, glBegin, etc).
diff --git a/src/hgl/GLDispatcher.h b/src/hgl/GLDispatcher.h
index 44bca8c..7ee095d 100644
--- a/src/hgl/GLDispatcher.h
+++ b/src/hgl/GLDispatcher.h
@@ -1,6 +1,6 @@
 /*
  * Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
- * Copyright 2000-2012 Haiku, Inc. All Rights Reserved.
+ * Copyright 2000-2015 Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -17,9 +17,7 @@
 
 #include "glheader.h"
 
-extern "C" {
 #include "glapi/glapi.h"
-}
 
 
 class BGLDispatcher
-- 
1.7.1



More information about the mesa-dev mailing list