diff options
| author | Julien Cristau <jcristau@debian.org> | 2007-12-18 12:28:29 +0100 |
|---|---|---|
| committer | Julien Cristau <jcristau@debian.org> | 2007-12-18 12:28:29 +0100 |
| commit | c02990525c091c9dbdff3aa56414f9fb67c4c0af (patch) | |
| tree | a51a2c0019aef95e7bafa228b6b056a230568140 /include | |
| parent | ae0bf74db93b5c3f9260fefd3546dccfea1e80fc (diff) | |
| parent | 0107acded03c510df2093b0b98bca52b5734dd5b (diff) | |
Merge branch 'mesa_7_0_branch' of git.freedesktop.org:/git/mesa/mesa into debian-unstable
Conflicts:
progs/trivial/quad-clip-nearplane.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/GL/glutf90.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/GL/glutf90.h b/include/GL/glutf90.h index 7ba3e19ef9e..8a3a86727cf 100644 --- a/include/GL/glutf90.h +++ b/include/GL/glutf90.h @@ -75,7 +75,7 @@ typedef void (GLUTCALLBACK *GLUTmenuStatusFCB) (int *, int *, int *); typedef void (GLUTCALLBACK *GLUTidleFCB) (void); /* Functions that set and return Fortran callback functions. */ -GLUTAPI void* APIENTRY __glutGetFCB(int which); -GLUTAPI void APIENTRY __glutSetFCB(int which, void *func); +GLUTAPI GLUTproc APIENTRY __glutGetFCB(int which); +GLUTAPI void APIENTRY __glutSetFCB(int which, GLUTproc func); #endif /* __glutf90_h__ */ |