Fix gles2 conformance tests

No idea why these stopped working

TEST=they compile and run
BUG=none


Review URL: https://chromiumcodereview.appspot.com/10532111

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141778 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 14 insertions, 5 deletions

diff --git a/gpu/gles2_conform_support/native/egl_native.cc b/gpu/gles2_conform_support/native/egl_native.cc
index 97e0a44..02a8ba4 100644
--- a/gpu/gles2_conform_support/native/egl_native.cc
+++ b/gpu/gles2_conform_support/native/egl_native.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -8,7 +8,6 @@ extern "C" {
 #else
 #include "third_party/gles2_conform/GTF_ES/glsl/GTF/Source/eglNative.h"
 #endif
-}
 
 GTFbool GTFNativeCreatePixmap(EGLNativeDisplayType nativeDisplay,
                               EGLDisplay eglDisplay, EGLConfig eglConfig,
@@ -20,3 +19,7 @@ GTFbool GTFNativeCreatePixmap(EGLNativeDisplayType nativeDisplay,
 void GTFNativeDestroyPixmap(EGLNativeDisplayType nativeDisplay,
                             EGLNativePixmapType nativePixmap) {
 }
+
+}  // extern "C"
+
+
diff --git a/gpu/gles2_conform_support/native/egl_native_linux.cc b/gpu/gles2_conform_support/native/egl_native_linux.cc
index a356e61..c57a6f5 100644
--- a/gpu/gles2_conform_support/native/egl_native_linux.cc
+++ b/gpu/gles2_conform_support/native/egl_native_linux.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -13,7 +13,6 @@ extern "C" {
 #else
 #include "third_party/gles2_conform/GTF_ES/glsl/GTF/Source/eglNative.h"
 #endif
-}
 
 
 GTFbool GTFNativeCreateDisplay(EGLNativeDisplayType *pNativeDisplay) {
@@ -119,3 +118,6 @@ void GTFDestroyEGLImage(EGLImageKHR image) {
 
   egl_destroy_image_khr_(eglGetCurrentDisplay(), image);
 }
+
+}  // extern "C"
+
diff --git a/gpu/gles2_conform_support/native/egl_native_win.cc b/gpu/gles2_conform_support/native/egl_native_win.cc
index c083cca..acb286d 100644
--- a/gpu/gles2_conform_support/native/egl_native_win.cc
+++ b/gpu/gles2_conform_support/native/egl_native_win.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -38,6 +38,8 @@ LRESULT CALLBACK WindowProc(HWND hwnd, UINT msg,
 }
 }  // namespace.
 
+extern "C" {
+
 GTFbool GTFNativeCreateDisplay(EGLNativeDisplayType *pNativeDisplay) {
   *pNativeDisplay = EGL_DEFAULT_DISPLAY;
   return GTFtrue;
@@ -111,3 +113,5 @@ EGLImageKHR GTFCreateEGLImage(int width, int height,
 
 void GTFDestroyEGLImage(EGLImageKHR image) {
 }
+
+}  // extern "C"