From cf71e7093c301a1d3dc3e19d88d44a043ccadc7d Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Wed, 13 May 2015 14:22:57 -0400 Subject: [PATCH] glapi/hgl: Drop extern "C" as it was added to glapi Reviewed-by: Brian Paul --- 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 46b91d57c49..a1e9053617c 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 44bca8ce586..7ee095d917b 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 -- 2.30.2