From 85ef9930f56bf15181f9a0b238f03d55303cf411 Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 22 Nov 2010 19:42:40 +0000 Subject: Updated to mesalib 7.9 --- mesalib/include/GLES/glplatform.h | 86 +++++++++------------------------------ 1 file changed, 20 insertions(+), 66 deletions(-) (limited to 'mesalib/include/GLES/glplatform.h') diff --git a/mesalib/include/GLES/glplatform.h b/mesalib/include/GLES/glplatform.h index 7c8392bfc..c316c1aa1 100644 --- a/mesalib/include/GLES/glplatform.h +++ b/mesalib/include/GLES/glplatform.h @@ -1,76 +1,30 @@ #ifndef __glplatform_h_ #define __glplatform_h_ - -#ifdef __cplusplus -extern "C" { -#endif +/* $Revision$ on $Date:: 2010-03-04 22:15:27 -0800 #$ */ /* -** 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: -** -** http://oss.sgi.com/projects/FreeB -** -** 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. -** -** 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. -*/ - -/*------------------------------------------------------------------------- - * 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 - - -#ifndef APIENTRY -# define APIENTRY GL_APIENTRY + * This document is licensed under the SGI Free Software B License Version + * 2.0. For details, see http://oss.sgi.com/projects/FreeB/ . + */ + +/* Platform-specific types and definitions for OpenGL ES 1.X gl.h + * + * Adopters may modify khrplatform.h and this file to suit their platform. + * You are encouraged to submit all modifications to the Khronos group so that + * they can be included in future versions of this file. Please submit changes + * by sending them to the public Khronos Bugzilla (http://khronos.org/bugzilla) + * by filing a bug against product "OpenGL-ES" component "Registry". + */ + +#include + +#ifndef GL_API +#define GL_API KHRONOS_APICALL #endif -#ifdef __cplusplus -} +#ifndef GL_APIENTRY +#define GL_APIENTRY KHRONOS_APIENTRY #endif #endif /* __glplatform_h_ */ -- cgit v1.2.3