X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=include%2FGLES%2Fglplatform.h;h=16060a9a73ba32a7eedf44c4ccdd512d8fafc637;hb=13fd4e601c80b85317feac894c52bd24e4f98c09;hp=7c8392bfcb2e79478e1f6f8adba8aefe8f888b6c;hpb=f25a90ed222216d89b3cd33ec60647ff78286074;p=mesa.git

diff --git a/include/GLES/glplatform.h b/include/GLES/glplatform.h
index 7c8392bfcb2..16060a9a73b 100644
--- a/include/GLES/glplatform.h
+++ b/include/GLES/glplatform.h
@@ -1,76 +1,38 @@
 #ifndef __glplatform_h_
 #define __glplatform_h_
 
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /*
-** License Applicability. Except to the extent portions of this file are
-** made subject to an alternative license as permitted in the SGI Free
-** Software License B, Version 1.0 (the "License"), the contents of this
-** file are subject only to the provisions of the License. You may not use
-** this file except in compliance with the License. You may obtain a copy
-** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
-** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
+** Copyright (c) 2017 The Khronos Group Inc.
 **
-** http://oss.sgi.com/projects/FreeB
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
 **
-** Note that, as provided in the License, the Software is distributed on an
-** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
-** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
-** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
-** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
+**     http://www.apache.org/licenses/LICENSE-2.0
 **
-** Original Code. The Original Code is: OpenGL Sample Implementation,
-** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
-** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
-** Copyright in any portions created by third parties is as indicated
-** elsewhere herein. All Rights Reserved.
-**
-** Additional Notice Provisions: The application programming interfaces
-** established by SGI in conjunction with the Original Code are The
-** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
-** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
-** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
-** Window System(R) (Version 1.3), released October 19, 1998. This software
-** was created using the OpenGL(R) version 1.2.1 Sample Implementation
-** published by SGI, but has not been independently verified as being
-** compliant with the OpenGL(R) version 1.2.1 Specification.
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
 */
 
-/*-------------------------------------------------------------------------
- * Definition of GL_API and GL_APIENTRY
- *-----------------------------------------------------------------------*/
-
-#ifdef _WIN32
-#   ifdef __GL_EXPORTS
-#       define GL_API __declspec(dllexport)
-#   else
-#       define GL_API __declspec(dllimport)
-#   endif
-#   ifdef UNDER_CE
-#       define GL_APIENTRY
-#   else
-#       define GL_APIENTRY __stdcall
-#   endif
-#else
-#   ifdef __GL_EXPORTS
-#       define GL_API
-#   else
-#       define GL_API extern
-#   endif
-#   define GL_APIENTRY
-#endif
+/* Platform-specific types and definitions for OpenGL ES 1.X  gl.h
+ *
+ * Adopters may modify khrplatform.h and this file to suit their platform.
+ * Please contribute modifications back to Khronos as pull requests on the
+ * public github repository:
+ *      https://github.com/KhronosGroup/OpenGL-Registry
+ */
 
+#include <KHR/khrplatform.h>
 
-#ifndef APIENTRY
-#   define APIENTRY GL_APIENTRY
+#ifndef GL_API
+#define GL_API      KHRONOS_APICALL
 #endif
 
-#ifdef __cplusplus
-}
+#ifndef GL_APIENTRY
+#define GL_APIENTRY KHRONOS_APIENTRY
 #endif
 
 #endif /* __glplatform_h_ */