diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-05-22 14:50:26 -0400 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-uranus.epoch.ncsc.mil> | 2007-05-22 14:50:26 -0400 |
| commit | 2a4aa63a23ddd816b647b851a01865861827a7eb (patch) | |
| tree | a957a7979bda27a4a2c103835cfd6e3a7ddc79e5 /hw/dmx | |
| parent | 9cee4ec5e6e06d23aafb302494b082c77ade4623 (diff) | |
| parent | cc648e609d472472bac4a2e568eb3598b3690ba3 (diff) | |
Merge branch 'master' into XACE-SELINUX
Conflicts:
include/miscstruct.h
Diffstat (limited to 'hw/dmx')
| -rw-r--r-- | hw/dmx/dmx-config.h | 2 | ||||
| -rw-r--r-- | hw/dmx/glxProxy/glxext.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/hw/dmx/dmx-config.h b/hw/dmx/dmx-config.h index 9647448dc..18a05356b 100644 --- a/hw/dmx/dmx-config.h +++ b/hw/dmx/dmx-config.h @@ -66,7 +66,7 @@ ((year-2000) * 10000) + \ ((month) * 100) + \ ((day) * 1) -#define VENDOR_RELEASE DMX_VENDOR_RELEASE(1,2,2004,6,30) +#define VENDOR_RELEASE DMX_VENDOR_RELEASE(1,2,2007,4,24) #define VENDOR_STRING "DMX Project" /* Enable the DMX extension */ diff --git a/hw/dmx/glxProxy/glxext.h b/hw/dmx/glxProxy/glxext.h index 8572aa43a..011393732 100644 --- a/hw/dmx/glxProxy/glxext.h +++ b/hw/dmx/glxProxy/glxext.h @@ -67,7 +67,7 @@ extern void __glXFreeGLXPixmap( __GLXpixmap *pGlxPixmap ); extern void __glXNoSuchRenderOpcode(GLbyte*); extern int __glXNoSuchSingleOpcode(__GLXclientState*, GLbyte*); -extern void __glXErrorCallBack(__GLinterface *gc, GLenum code); +extern void __glXErrorCallBack(GLenum code); extern void __glXClearErrorOccured(void); extern GLboolean __glXErrorOccured(void); extern void __glXResetLargeCommandStatus(__GLXclientState*); |