glx: drop obsolete glxbyteorder.h
It's just a local header, doing nothing more than including misc.h, so we can just include misc.h directly and drop glxbyteorder.h Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net> Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1728>
This commit is contained in:
		
							parent
							
								
									e8784b7d89
								
							
						
					
					
						commit
						2d8af9cc5e
					
				|  | @ -22,9 +22,9 @@ | ||||||
|  */ |  */ | ||||||
| #include <dix-config.h> | #include <dix-config.h> | ||||||
| 
 | 
 | ||||||
|  | #include "misc.h" | ||||||
| #include "glxserver.h" | #include "glxserver.h" | ||||||
| #include "indirect_dispatch.h" | #include "indirect_dispatch.h" | ||||||
| #include "glxbyteorder.h" |  | ||||||
| #include "unpack.h" | #include "unpack.h" | ||||||
| 
 | 
 | ||||||
| static int | static int | ||||||
|  |  | ||||||
|  | @ -1,40 +0,0 @@ | ||||||
| /*
 |  | ||||||
|  * (C) Copyright IBM Corporation 2006, 2007 |  | ||||||
|  * All Rights Reserved. |  | ||||||
|  * |  | ||||||
|  * Permission is hereby granted, free of charge, to any person obtaining a |  | ||||||
|  * copy of this software and associated documentation files (the "Software"), |  | ||||||
|  * to deal in the Software without restriction, including without limitation |  | ||||||
|  * the rights to use, copy, modify, merge, publish, distribute, sub license, |  | ||||||
|  * and/or sell copies of the Software, and to permit persons to whom the |  | ||||||
|  * Software is furnished to do so, subject to the following conditions: |  | ||||||
|  * |  | ||||||
|  * The above copyright notice and this permission notice (including the next |  | ||||||
|  * paragraph) shall be included in all copies or substantial portions of the |  | ||||||
|  * Software. |  | ||||||
|  * |  | ||||||
|  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |  | ||||||
|  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |  | ||||||
|  * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL |  | ||||||
|  * THE COPYRIGHT HOLDERS, THE AUTHORS, AND/OR THEIR SUPPLIERS BE LIABLE FOR |  | ||||||
|  * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, |  | ||||||
|  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE |  | ||||||
|  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. |  | ||||||
|  */ |  | ||||||
| 
 |  | ||||||
| /**
 |  | ||||||
|  * \file glxbyteorder.h |  | ||||||
|  * Platform glue for handling byte-ordering issues in GLX protocol. |  | ||||||
|  * |  | ||||||
|  * \author Ian Romanick <idr@us.ibm.com> |  | ||||||
|  */ |  | ||||||
| #if !defined(__GLXBYTEORDER_H__) |  | ||||||
| #define __GLXBYTEORDER_H__ |  | ||||||
| 
 |  | ||||||
| #ifdef HAVE_DIX_CONFIG_H |  | ||||||
| #include <dix-config.h> |  | ||||||
| #endif |  | ||||||
| 
 |  | ||||||
| #include "misc.h" |  | ||||||
| 
 |  | ||||||
| #endif                          /* !defined(__GLXBYTEORDER_H__) */ |  | ||||||
|  | @ -24,14 +24,16 @@ | ||||||
|  * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE |  * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||||||
|  * SOFTWARE. |  * SOFTWARE. | ||||||
|  */ |  */ | ||||||
|  | #include <dix-config.h> | ||||||
| 
 | 
 | ||||||
| #include <inttypes.h> | #include <inttypes.h> | ||||||
|  | 
 | ||||||
| #include "glxserver.h" | #include "glxserver.h" | ||||||
| #include "indirect_size.h" | #include "indirect_size.h" | ||||||
| #include "indirect_size_get.h" | #include "indirect_size_get.h" | ||||||
| #include "indirect_dispatch.h" | #include "indirect_dispatch.h" | ||||||
| #include "glxbyteorder.h" |  | ||||||
| #include "indirect_util.h" | #include "indirect_util.h" | ||||||
|  | #include "misc.h" | ||||||
| #include "singlesize.h" | #include "singlesize.h" | ||||||
| 
 | 
 | ||||||
| #define __GLX_PAD(x)  (((x) + 3) & ~3) | #define __GLX_PAD(x)  (((x) + 3) & ~3) | ||||||
|  |  | ||||||
|  | @ -24,14 +24,16 @@ | ||||||
|  * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE |  * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||||||
|  * SOFTWARE. |  * SOFTWARE. | ||||||
|  */ |  */ | ||||||
|  | #include <dix-config.h> | ||||||
| 
 | 
 | ||||||
| #include <inttypes.h> | #include <inttypes.h> | ||||||
|  | 
 | ||||||
| #include "glxserver.h" | #include "glxserver.h" | ||||||
| #include "indirect_size.h" | #include "indirect_size.h" | ||||||
| #include "indirect_size_get.h" | #include "indirect_size_get.h" | ||||||
| #include "indirect_dispatch.h" | #include "indirect_dispatch.h" | ||||||
| #include "glxbyteorder.h" |  | ||||||
| #include "indirect_util.h" | #include "indirect_util.h" | ||||||
|  | #include "misc.h" | ||||||
| #include "singlesize.h" | #include "singlesize.h" | ||||||
| 
 | 
 | ||||||
| #define __GLX_PAD(x)  (((x) + 3) & ~3) | #define __GLX_PAD(x)  (((x) + 3) & ~3) | ||||||
|  |  | ||||||
|  | @ -28,12 +28,11 @@ | ||||||
|  * |  * | ||||||
|  * \author Ian Romanick <idr@us.ibm.com> |  * \author Ian Romanick <idr@us.ibm.com> | ||||||
|  */ |  */ | ||||||
| 
 |  | ||||||
| #include <dix-config.h> | #include <dix-config.h> | ||||||
| 
 | 
 | ||||||
| #include "glxserver.h" | #include "glxserver.h" | ||||||
| #include "glxbyteorder.h" |  | ||||||
| #include "glxext.h" | #include "glxext.h" | ||||||
|  | #include "misc.h" | ||||||
| #include "singlesize.h" | #include "singlesize.h" | ||||||
| #include "unpack.h" | #include "unpack.h" | ||||||
| #include "indirect_size_get.h" | #include "indirect_size_get.h" | ||||||
|  |  | ||||||
|  | @ -24,12 +24,14 @@ | ||||||
|  * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE |  * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||||||
|  * SOFTWARE. |  * SOFTWARE. | ||||||
|  */ |  */ | ||||||
|  | #include <dix-config.h> | ||||||
| 
 | 
 | ||||||
| #include <GL/gl.h> | #include <GL/gl.h> | ||||||
|  | 
 | ||||||
| #include "glxserver.h" | #include "glxserver.h" | ||||||
| #include "glxbyteorder.h" |  | ||||||
| #include "indirect_size.h" | #include "indirect_size.h" | ||||||
| #include "indirect_reqsize.h" | #include "indirect_reqsize.h" | ||||||
|  | #include "misc.h" | ||||||
| 
 | 
 | ||||||
| #if defined(__CYGWIN__) || defined(__MINGW32__) | #if defined(__CYGWIN__) || defined(__MINGW32__) | ||||||
| #undef HAVE_ALIAS | #undef HAVE_ALIAS | ||||||
|  |  | ||||||
|  | @ -22,12 +22,11 @@ | ||||||
|  * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE |  * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||||||
|  * SOFTWARE. |  * SOFTWARE. | ||||||
|  */ |  */ | ||||||
| 
 |  | ||||||
| #include <dix-config.h> | #include <dix-config.h> | ||||||
| 
 | 
 | ||||||
| #include "glxserver.h" | #include "glxserver.h" | ||||||
| #include "glxbyteorder.h" |  | ||||||
| #include "glxext.h" | #include "glxext.h" | ||||||
|  | #include "misc.h" | ||||||
| #include "singlesize.h" | #include "singlesize.h" | ||||||
| #include "unpack.h" | #include "unpack.h" | ||||||
| #include "indirect_size_get.h" | #include "indirect_size_get.h" | ||||||
|  |  | ||||||
|  | @ -22,24 +22,23 @@ | ||||||
|  * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE |  * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||||||
|  * SOFTWARE. |  * SOFTWARE. | ||||||
|  */ |  */ | ||||||
| 
 |  | ||||||
| #include <dix-config.h> | #include <dix-config.h> | ||||||
| 
 | 
 | ||||||
|  | #include <inttypes.h> | ||||||
| #include <string.h> | #include <string.h> | ||||||
| 
 | #include <X11/Xmd.h> // needs to be before glxproto.h | ||||||
| #include <X11/Xmd.h> |  | ||||||
| #include <GL/gl.h> | #include <GL/gl.h> | ||||||
| #include <GL/glxproto.h> | #include <GL/glxproto.h> | ||||||
| #include <inttypes.h> | 
 | ||||||
| #include "indirect_size.h" | #include "indirect_size.h" | ||||||
| #include "indirect_size_get.h" | #include "indirect_size_get.h" | ||||||
| #include "indirect_dispatch.h" | #include "indirect_dispatch.h" | ||||||
| #include "glxserver.h" | #include "glxserver.h" | ||||||
| #include "glxbyteorder.h" |  | ||||||
| #include "singlesize.h" | #include "singlesize.h" | ||||||
| #include "glxext.h" | #include "glxext.h" | ||||||
| #include "indirect_table.h" | #include "indirect_table.h" | ||||||
| #include "indirect_util.h" | #include "indirect_util.h" | ||||||
|  | #include "misc.h" | ||||||
| 
 | 
 | ||||||
| #define __GLX_PAD(a) (((a)+3)&~3) | #define __GLX_PAD(a) (((a)+3)&~3) | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -27,11 +27,11 @@ | ||||||
| #include "glxserver.h" | #include "glxserver.h" | ||||||
| #include "glxutil.h" | #include "glxutil.h" | ||||||
| #include "glxext.h" | #include "glxext.h" | ||||||
|  | #include "misc.h" | ||||||
| #include "singlesize.h" | #include "singlesize.h" | ||||||
| #include "unpack.h" | #include "unpack.h" | ||||||
| #include "indirect_size_get.h" | #include "indirect_size_get.h" | ||||||
| #include "indirect_dispatch.h" | #include "indirect_dispatch.h" | ||||||
| #include "glxbyteorder.h" |  | ||||||
| 
 | 
 | ||||||
| static int DoSwapInterval(__GLXclientState * cl, GLbyte * pc, int do_swap); | static int DoSwapInterval(__GLXclientState * cl, GLbyte * pc, int do_swap); | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue