Ignore:
Timestamp:
Feb 29, 2000, 2:56:52 PM (25 years ago)
Author:
sandervl
Message:

compile fixes

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/opengl/glut/glut.h

    r2689 r2945  
    1 /* $Id: glut.h,v 1.2 2000-02-09 08:46:07 jeroen Exp $ */
     1/* $Id: glut.h,v 1.3 2000-02-29 13:56:51 sandervl Exp $ */
    22#ifndef __glut_h__
    33#define __glut_h__
    … …  
    404404
    405405/* GLUT initialization sub-API. */
    406 extern void APIENTRY glutInit(int *argcp, char **argv);
    407 extern void APIENTRY glutInitDisplayMode(unsigned int mode);
     406extern void GLAPIENTRY glutInit(int *argcp, char **argv);
     407extern void GLAPIENTRY glutInitDisplayMode(unsigned int mode);
    408408#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9)
    409 extern void APIENTRY glutInitDisplayString(const char *string);
    410 #endif
    411 extern void APIENTRY glutInitWindowPosition(int x, int y);
    412 extern void APIENTRY glutInitWindowSize(int width, int height);
    413 extern void APIENTRY glutMainLoop(void);
     409extern void GLAPIENTRY glutInitDisplayString(const char *string);
     410#endif
     411extern void GLAPIENTRY glutInitWindowPosition(int x, int y);
     412extern void GLAPIENTRY glutInitWindowSize(int width, int height);
     413extern void GLAPIENTRY glutMainLoop(void);
    414414
    415415/* GLUT window sub-API. */
    416 extern int APIENTRY glutCreateWindow(const char *title);
    417 extern int APIENTRY glutCreateSubWindow(int win, int x, int y, int width, int height);
    418 extern void APIENTRY glutDestroyWindow(int win);
    419 extern void APIENTRY glutPostRedisplay(void);
     416extern int GLAPIENTRY glutCreateWindow(const char *title);
     417extern int GLAPIENTRY glutCreateSubWindow(int win, int x, int y, int width, int height);
     418extern void GLAPIENTRY glutDestroyWindow(int win);
     419extern void GLAPIENTRY glutPostRedisplay(void);
    420420#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 11)
    421 extern void APIENTRY glutPostWindowRedisplay(int win);
    422 #endif
    423 extern void APIENTRY glutSwapBuffers(void);
    424 extern int APIENTRY glutGetWindow(void);
    425 extern void APIENTRY glutSetWindow(int win);
    426 extern void APIENTRY glutSetWindowTitle(const char *title);
    427 extern void APIENTRY glutSetIconTitle(const char *title);
    428 extern void APIENTRY glutPositionWindow(int x, int y);
    429 extern void APIENTRY glutReshapeWindow(int width, int height);
    430 extern void APIENTRY glutPopWindow(void);
    431 extern void APIENTRY glutPushWindow(void);
    432 extern void APIENTRY glutIconifyWindow(void);
    433 extern void APIENTRY glutShowWindow(void);
    434 extern void APIENTRY glutHideWindow(void);
    435 #if (GLUT_API_VERSION >= 3)
    436 extern void APIENTRY glutFullScreen(void);
    437 extern void APIENTRY glutSetCursor(int cursor);
     421extern void GLAPIENTRY glutPostWindowRedisplay(int win);
     422#endif
     423extern void GLAPIENTRY glutSwapBuffers(void);
     424extern int GLAPIENTRY glutGetWindow(void);
     425extern void GLAPIENTRY glutSetWindow(int win);
     426extern void GLAPIENTRY glutSetWindowTitle(const char *title);
     427extern void GLAPIENTRY glutSetIconTitle(const char *title);
     428extern void GLAPIENTRY glutPositionWindow(int x, int y);
     429extern void GLAPIENTRY glutReshapeWindow(int width, int height);
     430extern void GLAPIENTRY glutPopWindow(void);
     431extern void GLAPIENTRY glutPushWindow(void);
     432extern void GLAPIENTRY glutIconifyWindow(void);
     433extern void GLAPIENTRY glutShowWindow(void);
     434extern void GLAPIENTRY glutHideWindow(void);
     435#if (GLUT_API_VERSION >= 3)
     436extern void GLAPIENTRY glutFullScreen(void);
     437extern void GLAPIENTRY glutSetCursor(int cursor);
    438438#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9)
    439 extern void APIENTRY glutWarpPointer(int x, int y);
     439extern void GLAPIENTRY glutWarpPointer(int x, int y);
    440440#endif
    441441
    442442/* GLUT overlay sub-API. */
    443 extern void APIENTRY glutEstablishOverlay(void);
    444 extern void APIENTRY glutRemoveOverlay(void);
    445 extern void APIENTRY glutUseLayer(GLenum layer);
    446 extern void APIENTRY glutPostOverlayRedisplay(void);
     443extern void GLAPIENTRY glutEstablishOverlay(void);
     444extern void GLAPIENTRY glutRemoveOverlay(void);
     445extern void GLAPIENTRY glutUseLayer(GLenum layer);
     446extern void GLAPIENTRY glutPostOverlayRedisplay(void);
    447447#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 11)
    448 extern void APIENTRY glutPostWindowOverlayRedisplay(int win);
    449 #endif
    450 extern void APIENTRY glutShowOverlay(void);
    451 extern void APIENTRY glutHideOverlay(void);
     448extern void GLAPIENTRY glutPostWindowOverlayRedisplay(int win);
     449#endif
     450extern void GLAPIENTRY glutShowOverlay(void);
     451extern void GLAPIENTRY glutHideOverlay(void);
    452452#endif
    453453
    454454/* GLUT menu sub-API. */
    455 extern int APIENTRY glutCreateMenu(void (*)(int));
    456 extern void APIENTRY glutDestroyMenu(int menu);
    457 extern int APIENTRY glutGetMenu(void);
    458 extern void APIENTRY glutSetMenu(int menu);
    459 extern void APIENTRY glutAddMenuEntry(const char *label, int value);
    460 extern void APIENTRY glutAddSubMenu(const char *label, int submenu);
    461 extern void APIENTRY glutChangeToMenuEntry(int item, const char *label, int value);
    462 extern void APIENTRY glutChangeToSubMenu(int item, const char *label, int submenu);
    463 extern void APIENTRY glutRemoveMenuItem(int item);
    464 extern void APIENTRY glutAttachMenu(int button);
    465 extern void APIENTRY glutDetachMenu(int button);
     455extern int GLAPIENTRY glutCreateMenu(void (*)(int));
     456extern void GLAPIENTRY glutDestroyMenu(int menu);
     457extern int GLAPIENTRY glutGetMenu(void);
     458extern void GLAPIENTRY glutSetMenu(int menu);
     459extern void GLAPIENTRY glutAddMenuEntry(const char *label, int value);
     460extern void GLAPIENTRY glutAddSubMenu(const char *label, int submenu);
     461extern void GLAPIENTRY glutChangeToMenuEntry(int item, const char *label, int value);
     462extern void GLAPIENTRY glutChangeToSubMenu(int item, const char *label, int submenu);
     463extern void GLAPIENTRY glutRemoveMenuItem(int item);
     464extern void GLAPIENTRY glutAttachMenu(int button);
     465extern void GLAPIENTRY glutDetachMenu(int button);
    466466
    467467/* GLUT window callback sub-API. */
    468 extern void APIENTRY glutDisplayFunc(void (*func)(void));
    469 extern void APIENTRY glutReshapeFunc(void (*func)(int width, int height));
    470 extern void APIENTRY glutKeyboardFunc(void (*func)(unsigned char key, int x, int y));
    471 extern void APIENTRY glutMouseFunc(void (*func)(int button, int state, int x, int y));
    472 extern void APIENTRY glutMotionFunc(void (*func)(int x, int y));
    473 extern void APIENTRY glutPassiveMotionFunc(void (*func)(int x, int y));
    474 extern void APIENTRY glutEntryFunc(void (*func)(int state));
    475 extern void APIENTRY glutVisibilityFunc(void (*func)(int state));
    476 extern void APIENTRY glutIdleFunc(void (*func)(void));
    477 extern void APIENTRY glutTimerFunc(unsigned int millis, void (*func)(int value), int value);
    478 extern void APIENTRY glutMenuStateFunc(void (*func)(int state));
     468extern void GLAPIENTRY glutDisplayFunc(void (*func)(void));
     469extern void GLAPIENTRY glutReshapeFunc(void (*func)(int width, int height));
     470extern void GLAPIENTRY glutKeyboardFunc(void (*func)(unsigned char key, int x, int y));
     471extern void GLAPIENTRY glutMouseFunc(void (*func)(int button, int state, int x, int y));
     472extern void GLAPIENTRY glutMotionFunc(void (*func)(int x, int y));
     473extern void GLAPIENTRY glutPassiveMotionFunc(void (*func)(int x, int y));
     474extern void GLAPIENTRY glutEntryFunc(void (*func)(int state));
     475extern void GLAPIENTRY glutVisibilityFunc(void (*func)(int state));
     476extern void GLAPIENTRY glutIdleFunc(void (*func)(void));
     477extern void GLAPIENTRY glutTimerFunc(unsigned int millis, void (*func)(int value), int value);
     478extern void GLAPIENTRY glutMenuStateFunc(void (*func)(int state));
    479479#if (GLUT_API_VERSION >= 2)
    480 extern void APIENTRY glutSpecialFunc(void (*func)(int key, int x, int y));
    481 extern void APIENTRY glutSpaceballMotionFunc(void (*func)(int x, int y, int z));
    482 extern void APIENTRY glutSpaceballRotateFunc(void (*func)(int x, int y, int z));
    483 extern void APIENTRY glutSpaceballButtonFunc(void (*func)(int button, int state));
    484 extern void APIENTRY glutButtonBoxFunc(void (*func)(int button, int state));
    485 extern void APIENTRY glutDialsFunc(void (*func)(int dial, int value));
    486 extern void APIENTRY glutTabletMotionFunc(void (*func)(int x, int y));
    487 extern void APIENTRY glutTabletButtonFunc(void (*func)(int button, int state, int x, int y));
    488 #if (GLUT_API_VERSION >= 3)
    489 extern void APIENTRY glutMenuStatusFunc(void (*func)(int status, int x, int y));
    490 extern void APIENTRY glutOverlayDisplayFunc(void (*func)(void));
     480extern void GLAPIENTRY glutSpecialFunc(void (*func)(int key, int x, int y));
     481extern void GLAPIENTRY glutSpaceballMotionFunc(void (*func)(int x, int y, int z));
     482extern void GLAPIENTRY glutSpaceballRotateFunc(void (*func)(int x, int y, int z));
     483extern void GLAPIENTRY glutSpaceballButtonFunc(void (*func)(int button, int state));
     484extern void GLAPIENTRY glutButtonBoxFunc(void (*func)(int button, int state));
     485extern void GLAPIENTRY glutDialsFunc(void (*func)(int dial, int value));
     486extern void GLAPIENTRY glutTabletMotionFunc(void (*func)(int x, int y));
     487extern void GLAPIENTRY glutTabletButtonFunc(void (*func)(int button, int state, int x, int y));
     488#if (GLUT_API_VERSION >= 3)
     489extern void GLAPIENTRY glutMenuStatusFunc(void (*func)(int status, int x, int y));
     490extern void GLAPIENTRY glutOverlayDisplayFunc(void (*func)(void));
    491491#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9)
    492 extern void APIENTRY glutWindowStatusFunc(void (*func)(int state));
     492extern void GLAPIENTRY glutWindowStatusFunc(void (*func)(int state));
    493493#endif
    494494#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 13)
    495 extern void APIENTRY glutKeyboardUpFunc(void (*func)(unsigned char key, int x, int y));
    496 extern void APIENTRY glutSpecialUpFunc(void (*func)(int key, int x, int y));
    497 extern void APIENTRY glutJoystickFunc(void (*func)(unsigned int buttonMask, int x, int y, int z), int pollInterval);
     495extern void GLAPIENTRY glutKeyboardUpFunc(void (*func)(unsigned char key, int x, int y));
     496extern void GLAPIENTRY glutSpecialUpFunc(void (*func)(int key, int x, int y));
     497extern void GLAPIENTRY glutJoystickFunc(void (*func)(unsigned int buttonMask, int x, int y, int z), int pollInterval);
    498498#endif
    499499#endif
    … …  
    501501
    502502/* GLUT color index sub-API. */
    503 extern void APIENTRY glutSetColor(int, GLfloat red, GLfloat green, GLfloat blue);
    504 extern GLfloat APIENTRY glutGetColor(int ndx, int component);
    505 extern void APIENTRY glutCopyColormap(int win);
     503extern void GLAPIENTRY glutSetColor(int, GLfloat red, GLfloat green, GLfloat blue);
     504extern GLfloat GLAPIENTRY glutGetColor(int ndx, int component);
     505extern void GLAPIENTRY glutCopyColormap(int win);
    506506
    507507/* GLUT state retrieval sub-API. */
    508 extern int APIENTRY glutGet(GLenum type);
    509 extern int APIENTRY glutDeviceGet(GLenum type);
     508extern int GLAPIENTRY glutGet(GLenum type);
     509extern int GLAPIENTRY glutDeviceGet(GLenum type);
    510510#if (GLUT_API_VERSION >= 2)
    511511/* GLUT extension support sub-API */
    512 extern int APIENTRY glutExtensionSupported(const char *name);
    513 #endif
    514 #if (GLUT_API_VERSION >= 3)
    515 extern int APIENTRY glutGetModifiers(void);
    516 extern int APIENTRY glutLayerGet(GLenum type);
     512extern int GLAPIENTRY glutExtensionSupported(const char *name);
     513#endif
     514#if (GLUT_API_VERSION >= 3)
     515extern int GLAPIENTRY glutGetModifiers(void);
     516extern int GLAPIENTRY glutLayerGet(GLenum type);
    517517#endif
    518518
    519519/* GLUT font sub-API */
    520 extern void APIENTRY glutBitmapCharacter(void *font, int character);
    521 extern int APIENTRY glutBitmapWidth(void *font, int character);
    522 extern void APIENTRY glutStrokeCharacter(void *font, int character);
    523 extern int APIENTRY glutStrokeWidth(void *font, int character);
     520extern void GLAPIENTRY glutBitmapCharacter(void *font, int character);
     521extern int GLAPIENTRY glutBitmapWidth(void *font, int character);
     522extern void GLAPIENTRY glutStrokeCharacter(void *font, int character);
     523extern int GLAPIENTRY glutStrokeWidth(void *font, int character);
    524524#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9)
    525 extern int APIENTRY glutBitmapLength(void *font, const unsigned char *string);
    526 extern int APIENTRY glutStrokeLength(void *font, const unsigned char *string);
     525extern int GLAPIENTRY glutBitmapLength(void *font, const unsigned char *string);
     526extern int GLAPIENTRY glutStrokeLength(void *font, const unsigned char *string);
    527527#endif
    528528
    529529/* GLUT pre-built models sub-API */
    530 extern void APIENTRY glutWireSphere(GLdouble radius, GLint slices, GLint stacks);
    531 extern void APIENTRY glutSolidSphere(GLdouble radius, GLint slices, GLint stacks);
    532 extern void APIENTRY glutWireCone(GLdouble base, GLdouble height, GLint slices, GLint stacks);
    533 extern void APIENTRY glutSolidCone(GLdouble base, GLdouble height, GLint slices, GLint stacks);
    534 extern void APIENTRY glutWireCube(GLdouble size);
    535 extern void APIENTRY glutSolidCube(GLdouble size);
    536 extern void APIENTRY glutWireTorus(GLdouble innerRadius, GLdouble outerRadius, GLint sides, GLint rings);
    537 extern void APIENTRY glutSolidTorus(GLdouble innerRadius, GLdouble outerRadius, GLint sides, GLint rings);
    538 extern void APIENTRY glutWireDodecahedron(void);
    539 extern void APIENTRY glutSolidDodecahedron(void);
    540 extern void APIENTRY glutWireTeapot(GLdouble size);
    541 extern void APIENTRY glutSolidTeapot(GLdouble size);
    542 extern void APIENTRY glutWireOctahedron(void);
    543 extern void APIENTRY glutSolidOctahedron(void);
    544 extern void APIENTRY glutWireTetrahedron(void);
    545 extern void APIENTRY glutSolidTetrahedron(void);
    546 extern void APIENTRY glutWireIcosahedron(void);
    547 extern void APIENTRY glutSolidIcosahedron(void);
     530extern void GLAPIENTRY glutWireSphere(GLdouble radius, GLint slices, GLint stacks);
     531extern void GLAPIENTRY glutSolidSphere(GLdouble radius, GLint slices, GLint stacks);
     532extern void GLAPIENTRY glutWireCone(GLdouble base, GLdouble height, GLint slices, GLint stacks);
     533extern void GLAPIENTRY glutSolidCone(GLdouble base, GLdouble height, GLint slices, GLint stacks);
     534extern void GLAPIENTRY glutWireCube(GLdouble size);
     535extern void GLAPIENTRY glutSolidCube(GLdouble size);
     536extern void GLAPIENTRY glutWireTorus(GLdouble innerRadius, GLdouble outerRadius, GLint sides, GLint rings);
     537extern void GLAPIENTRY glutSolidTorus(GLdouble innerRadius, GLdouble outerRadius, GLint sides, GLint rings);
     538extern void GLAPIENTRY glutWireDodecahedron(void);
     539extern void GLAPIENTRY glutSolidDodecahedron(void);
     540extern void GLAPIENTRY glutWireTeapot(GLdouble size);
     541extern void GLAPIENTRY glutSolidTeapot(GLdouble size);
     542extern void GLAPIENTRY glutWireOctahedron(void);
     543extern void GLAPIENTRY glutSolidOctahedron(void);
     544extern void GLAPIENTRY glutWireTetrahedron(void);
     545extern void GLAPIENTRY glutSolidTetrahedron(void);
     546extern void GLAPIENTRY glutWireIcosahedron(void);
     547extern void GLAPIENTRY glutSolidIcosahedron(void);
    548548
    549549#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9)
    550550/* GLUT video resize sub-API. */
    551 extern int APIENTRY glutVideoResizeGet(GLenum param);
    552 extern void APIENTRY glutSetupVideoResizing(void);
    553 extern void APIENTRY glutStopVideoResizing(void);
    554 extern void APIENTRY glutVideoResize(int x, int y, int width, int height);
    555 extern void APIENTRY glutVideoPan(int x, int y, int width, int height);
     551extern int GLAPIENTRY glutVideoResizeGet(GLenum param);
     552extern void GLAPIENTRY glutSetupVideoResizing(void);
     553extern void GLAPIENTRY glutStopVideoResizing(void);
     554extern void GLAPIENTRY glutVideoResize(int x, int y, int width, int height);
     555extern void GLAPIENTRY glutVideoPan(int x, int y, int width, int height);
    556556
    557557/* GLUT debugging sub-API. */
    558 extern void APIENTRY glutReportErrors(void);
     558extern void GLAPIENTRY glutReportErrors(void);
    559559#endif
    560560
    … …  
    572572#define GLUT_JOYSTICK_BUTTON_D          8
    573573
    574 extern void APIENTRY glutIgnoreKeyRepeat(int ignore);
    575 extern void APIENTRY glutSetKeyRepeat(int repeatMode);
    576 extern void APIENTRY glutForceJoystickFunc(void);
     574extern void GLAPIENTRY glutIgnoreKeyRepeat(int ignore);
     575extern void GLAPIENTRY glutSetKeyRepeat(int repeatMode);
     576extern void GLAPIENTRY glutForceJoystickFunc(void);
    577577
    578578/* GLUT game mode sub-API. */
    … …  
    586586#define GLUT_GAME_MODE_DISPLAY_CHANGED  6
    587587
    588 extern void APIENTRY glutGameModeString(const char *string);
    589 extern int APIENTRY glutEnterGameMode(void);
    590 extern void APIENTRY glutLeaveGameMode(void);
    591 extern int APIENTRY glutGameModeGet(GLenum mode);
     588extern void GLAPIENTRY glutGameModeString(const char *string);
     589extern int GLAPIENTRY glutEnterGameMode(void);
     590extern void GLAPIENTRY glutLeaveGameMode(void);
     591extern int GLAPIENTRY glutGameModeGet(GLenum mode);
    592592#endif
    593593
Note: See TracChangeset for help on using the changeset viewer.