diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-12-04 21:45:33 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-12-04 21:45:33 +0100 |
| commit | c893ad65ca612962e59697b0174c74afb89cbe78 (patch) | |
| tree | 90906f572923256f08220d6c6d34286832dfba40 /nx-X11/extras/Mesa/src/mesa/drivers/x11 | |
| parent | b38d5b97dbd6c6b61c3ef0d046a4ba1c183a74f9 (diff) | |
| parent | 4e33fd4bef7c3254d53eb04a0d8f4312622f2092 (diff) | |
| download | nx-libs-c893ad65ca612962e59697b0174c74afb89cbe78.tar.gz nx-libs-c893ad65ca612962e59697b0174c74afb89cbe78.tar.bz2 nx-libs-c893ad65ca612962e59697b0174c74afb89cbe78.zip | |
Merge branch 'sunweaver-pr/drop-glx-ansic' into 3.6.x
Attributes GH PR #270: https://github.com/ArcticaProject/nx-libs/pull/270
Diffstat (limited to 'nx-X11/extras/Mesa/src/mesa/drivers/x11')
| -rw-r--r-- | nx-X11/extras/Mesa/src/mesa/drivers/x11/glxheader.h | 1 | ||||
| -rw-r--r-- | nx-X11/extras/Mesa/src/mesa/drivers/x11/xmesaP.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/nx-X11/extras/Mesa/src/mesa/drivers/x11/glxheader.h b/nx-X11/extras/Mesa/src/mesa/drivers/x11/glxheader.h index 33d937f1c..6a1f2ed20 100644 --- a/nx-X11/extras/Mesa/src/mesa/drivers/x11/glxheader.h +++ b/nx-X11/extras/Mesa/src/mesa/drivers/x11/glxheader.h @@ -38,7 +38,6 @@ # include "resource.h" # include "windowstr.h" # include "gcstruct.h" -# include "GL/xf86glx.h" # include "xf86glx_util.h" #else diff --git a/nx-X11/extras/Mesa/src/mesa/drivers/x11/xmesaP.h b/nx-X11/extras/Mesa/src/mesa/drivers/x11/xmesaP.h index 26255ae56..c5037e619 100644 --- a/nx-X11/extras/Mesa/src/mesa/drivers/x11/xmesaP.h +++ b/nx-X11/extras/Mesa/src/mesa/drivers/x11/xmesaP.h @@ -28,7 +28,6 @@ #ifdef XFree86Server -# include "GL/xf86glx.h" # include "xf86glx_util.h" #elif defined(USE_XSHM) # include <X11/extensions/XShm.h> |