| glu.h (6.1.7600.16385-Windows_7.0) | | glu.h (6.3.9600.17415-Windows_8.1) |
|---|
| | |
| skipping to change at line 22 | | skipping to change at line 22 |
|---|
| Utility Library. | | Utility Library. |
| | |
| --*/ | | --*/ |
| | |
| #ifndef __glu_h__ | | #ifndef __glu_h__ |
| #ifndef __GLU_H__ | | #ifndef __GLU_H__ |
| | |
| #define __glu_h__ | | #define __glu_h__ |
| #define __GLU_H__ | | #define __GLU_H__ |
| | |
|
| | #include <winapifamily.h> |
| #include <GL/gl.h> | | #include <GL/gl.h> |
| | |
| #ifdef __cplusplus | | #ifdef __cplusplus |
| extern "C" { | | extern "C" { |
| #endif | | #endif |
| | |
| /* | | /* |
| ** Copyright 1991-1993, Silicon Graphics, Inc. | | ** Copyright 1991-1993, Silicon Graphics, Inc. |
| ** All Rights Reserved. | | ** All Rights Reserved. |
| ** | | ** |
| | |
| skipping to change at line 45 | | skipping to change at line 46 |
|---|
| ** permission of Silicon Graphics, Inc. | | ** permission of Silicon Graphics, Inc. |
| ** | | ** |
| ** RESTRICTED RIGHTS LEGEND: | | ** RESTRICTED RIGHTS LEGEND: |
| ** Use, duplication or disclosure by the Government is subject to restrictions | | ** Use, duplication or disclosure by the Government is subject to restrictions |
| ** as set forth in subdivision (c)(1)(ii) of the Rights in Technical Data | | ** as set forth in subdivision (c)(1)(ii) of the Rights in Technical Data |
| ** and Computer Software clause at DFARS 252.227-7013, and/or in similar or | | ** and Computer Software clause at DFARS 252.227-7013, and/or in similar or |
| ** successor clauses in the FAR, DOD or NASA FAR Supplement. Unpublished - | | ** successor clauses in the FAR, DOD or NASA FAR Supplement. Unpublished - |
| ** rights reserved under the Copyright Laws of the United States. | | ** rights reserved under the Copyright Laws of the United States. |
| */ | | */ |
| | |
|
| | #pragma region Desktop Family |
| | #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) |
| | |
| /* | | /* |
| ** Return the error string associated with a particular error code. | | ** Return the error string associated with a particular error code. |
| ** This will return 0 for an invalid error code. | | ** This will return 0 for an invalid error code. |
| ** | | ** |
| ** The generic function prototype that can be compiled for ANSI or Unicode | | ** The generic function prototype that can be compiled for ANSI or Unicode |
| ** is defined as follows: | | ** is defined as follows: |
| ** | | ** |
| ** LPCTSTR APIENTRY gluErrorStringWIN (GLenum errCode); | | ** LPCTSTR APIENTRY gluErrorStringWIN (GLenum errCode); |
| */ | | */ |
| #ifdef UNICODE | | #ifdef UNICODE |
| | |
| skipping to change at line 571 | | skipping to change at line 575 |
|---|
| #define GLU_EXTERIOR 100123 | | #define GLU_EXTERIOR 100123 |
| #define GLU_UNKNOWN 100124 | | #define GLU_UNKNOWN 100124 |
| | |
| /* Names without "TESS_" prefix */ | | /* Names without "TESS_" prefix */ |
| #define GLU_BEGIN GLU_TESS_BEGIN | | #define GLU_BEGIN GLU_TESS_BEGIN |
| #define GLU_VERTEX GLU_TESS_VERTEX | | #define GLU_VERTEX GLU_TESS_VERTEX |
| #define GLU_END GLU_TESS_END | | #define GLU_END GLU_TESS_END |
| #define GLU_ERROR GLU_TESS_ERROR | | #define GLU_ERROR GLU_TESS_ERROR |
| #define GLU_EDGE_FLAG GLU_TESS_EDGE_FLAG | | #define GLU_EDGE_FLAG GLU_TESS_EDGE_FLAG |
| | |
|
| | #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ |
| | #pragma endregion |
| | |
| #ifdef __cplusplus | | #ifdef __cplusplus |
| } | | } |
| #endif | | #endif |
| | |
| #endif /* __GLU_H__ */ | | #endif /* __GLU_H__ */ |
| #endif /* __glu_h__ */ | | #endif /* __glu_h__ */ |
| | |
| End of changes. 3 change blocks. |
|---|
| 0 lines changed or deleted | | 7 lines changed or added |
|---|
|