diff options
| author | Dimitri Papadopoulos <dimitri_at@users.sf.net> | 2003-09-24 13:21:52 +0000 |
|---|---|---|
| committer | Dimitri Papadopoulos <dimitri_at@users.sf.net> | 2003-09-24 13:21:52 +0000 |
| commit | e3ae4e4f624a86bd7bcdff89471adcb1b665d508 (patch) | |
| tree | 74cb4bad30c68d9e4454c8ac42da7a23fe3b5ed3 | |
| parent | 288beac8c66e7088a250d623a4efe6907d2e5934 (diff) | |
| download | cygnal-e3ae4e4f624a86bd7bcdff89471adcb1b665d508.tar.gz cygnal-e3ae4e4f624a86bd7bcdff89471adcb1b665d508.tar.bz2 cygnal-e3ae4e4f624a86bd7bcdff89471adcb1b665d508.zip | |
* include/GL/glu.h (gluErrorUnicodeStringWIN): Add macro
function. MSDN suggests using gluErrorUnicodeStringWIN
instead of gluErrorString, as it allows both ANSI and Unicode
error strings.
* include/GL/glu.h (gluErrorUnicodeStringEXT): Make the
returned pointer const for consistency reasons.
| -rw-r--r-- | winsup/w32api/ChangeLog | 10 | ||||
| -rw-r--r-- | winsup/w32api/include/GL/glu.h | 8 |
2 files changed, 17 insertions, 1 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 5488f7819..df984d2c2 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,5 +1,15 @@ 2003-09-24 Dimitri Papadopoulos <papadopo@users.sourceforge.net> + * include/GL/glu.h (gluErrorUnicodeStringWIN): Add macro + function. MSDN suggests using gluErrorUnicodeStringWIN + instead of gluErrorString, as it allows both ANSI and Unicode + error strings. + + * include/GL/glu.h (gluErrorUnicodeStringEXT): Make the + returned pointer const for consistency reasons. + +2003-09-24 Dimitri Papadopoulos <papadopo@users.sourceforge.net> + * include/GL/glu.h (gluErrorUnicodeStringEXT): Add function. Function exists in glu32.def but is undocumented on MSDN. A Google search came up with this declaration. diff --git a/winsup/w32api/include/GL/glu.h b/winsup/w32api/include/GL/glu.h index c259d6fa9..7c6ee748b 100644 --- a/winsup/w32api/include/GL/glu.h +++ b/winsup/w32api/include/GL/glu.h @@ -227,7 +227,7 @@ GLAPI void APIENTRY gluEndPolygon (GLUtesselator* tess); GLAPI void APIENTRY gluEndSurface (GLUnurbs* nurb); GLAPI void APIENTRY gluEndTrim (GLUnurbs* nurb); GLAPI const GLubyte * APIENTRY gluErrorString (GLenum error); -GLAPI wchar_t* APIENTRY gluErrorUnicodeStringEXT (GLenum errCode); +GLAPI const wchar_t * APIENTRY gluErrorUnicodeStringEXT (GLenum error); GLAPI void APIENTRY gluGetNurbsProperty (GLUnurbs* nurb, GLenum property, GLfloat* data); GLAPI const GLubyte * APIENTRY gluGetString (GLenum name); GLAPI void APIENTRY gluGetTessProperty (GLUtesselator* tess, GLenum which, GLdouble* data); @@ -265,6 +265,12 @@ GLAPI void APIENTRY gluTessVertex (GLUtesselator* tess, GLdouble *location, GLvo GLAPI GLint APIENTRY gluUnProject (GLdouble winX, GLdouble winY, GLdouble winZ, const GLdouble *model, const GLdouble *proj, const GLint *view, GLdouble* objX, GLdouble* objY, GLdouble* objZ); GLAPI GLint APIENTRY gluUnProject4 (GLdouble winX, GLdouble winY, GLdouble winZ, GLdouble clipW, const GLdouble *model, const GLdouble *proj, const GLint *view, GLdouble nearVal, GLdouble farVal, GLdouble* objX, GLdouble* objY, GLdouble* objZ, GLdouble* objW); +#ifdef UNICODE +#define gluErrorStringWIN gluErrorUnicodeStringEXT +#else +#define gluErrorStringWIN gluErrorString +#endif + #ifdef __cplusplus } #endif |