frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glx: move include guards up to wrap the whole file 

See: https://gcc.gnu.org/onlinedocs/cppinternals/Guard-Macros.html
Signed-off-by: Mike Gelfand <mikedld@mikedld.com>
This commit is contained in:
Mike Gelfand 2025-06-23 22:26:46 +01:00
parent e2fd67a58d
commit 72b96636fc
No known key found for this signature in database
GPG Key ID: CC4DBBE3299B16F8
8 changed files with 56 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
glx/glxcontext.h
View File

@ -1,10 +1,3 @@
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#ifndef _GLX_context_h_
#define _GLX_context_h_
/* /*
* SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008) * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
* Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved. * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.
@ -35,6 +28,13 @@
* Silicon Graphics, Inc. * Silicon Graphics, Inc.
*/ */
#ifndef _GLX_context_h_
#define _GLX_context_h_
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
struct __GLXcontext { struct __GLXcontext {
void (*destroy) (__GLXcontext * context); void (*destroy) (__GLXcontext * context);
int (*makeCurrent) (__GLXcontext * context); int (*makeCurrent) (__GLXcontext * context);

14
glx/glxdrawable.h
View File

@ -1,10 +1,3 @@
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#ifndef _GLX_drawable_h_
#define _GLX_drawable_h_
/* /*
* SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008) * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
* Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved. * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.
@ -35,6 +28,13 @@
* Silicon Graphics, Inc. * Silicon Graphics, Inc.
*/ */
#ifndef _GLX_drawable_h_
#define _GLX_drawable_h_
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
/* We just need to avoid clashing with DRAWABLE_{WINDOW,PIXMAP} */ /* We just need to avoid clashing with DRAWABLE_{WINDOW,PIXMAP} */
enum { enum {
GLX_DRAWABLE_WINDOW, GLX_DRAWABLE_WINDOW,

14
glx/glxext.h
View File

@ -1,10 +1,3 @@
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#ifndef _glxext_h_
#define _glxext_h_
/* /*
* SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008) * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
* Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved. * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.
@ -35,6 +28,13 @@
* Silicon Graphics, Inc. * Silicon Graphics, Inc.
*/ */
#ifndef _glxext_h_
#define _glxext_h_
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
/* doing #include <GL/glx.h> & #include <GL/glxext.h> could cause problems /* doing #include <GL/glx.h> & #include <GL/glxext.h> could cause problems
* with overlapping definitions, so let's use the easy way * with overlapping definitions, so let's use the easy way
*/ */

14
glx/glxscreens.h
View File

@ -1,10 +1,3 @@
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#ifndef _GLX_screens_h_
#define _GLX_screens_h_
/* /*
* SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008) * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
* Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved. * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.
@ -35,6 +28,13 @@
* Silicon Graphics, Inc. * Silicon Graphics, Inc.
*/ */
#ifndef _GLX_screens_h_
#define _GLX_screens_h_
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#include "extension_string.h" #include "extension_string.h"
#include "glxvndabi.h" #include "glxvndabi.h"

14
glx/glxserver.h
View File

@ -1,10 +1,3 @@
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#ifndef _GLX_server_h_
#define _GLX_server_h_
/* /*
* SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008) * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
* Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved. * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.
@ -35,6 +28,13 @@
* Silicon Graphics, Inc. * Silicon Graphics, Inc.
*/ */
#ifndef _GLX_server_h_
#define _GLX_server_h_
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#include <X11/X.h> #include <X11/X.h>
#include <X11/Xproto.h> #include <X11/Xproto.h>
#include <X11/Xmd.h> #include <X11/Xmd.h>

14
glx/glxutil.h
View File

@ -1,10 +1,3 @@
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#ifndef _glxcmds_h_
#define _glxcmds_h_
/* /*
* SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008) * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
* Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved. * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.
@ -35,6 +28,13 @@
* Silicon Graphics, Inc. * Silicon Graphics, Inc.
*/ */
#ifndef _glxcmds_h_
#define _glxcmds_h_
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
extern GLboolean __glXDrawableInit(__GLXdrawable * drawable, extern GLboolean __glXDrawableInit(__GLXdrawable * drawable,
__GLXscreen * screen, __GLXscreen * screen,
DrawablePtr pDraw, int type, XID drawID, DrawablePtr pDraw, int type, XID drawID,

14
glx/singlesize.h
View File

@ -1,10 +1,3 @@
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#ifndef _singlesize_h_
#define _singlesize_h_
/* /*
* SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008) * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
* Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved. * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.
@ -35,6 +28,13 @@
* Silicon Graphics, Inc. * Silicon Graphics, Inc.
*/ */
#ifndef _singlesize_h_
#define _singlesize_h_
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#include "indirect_size.h" #include "indirect_size.h"
extern GLint __glReadPixels_size(GLenum format, GLenum type, extern GLint __glReadPixels_size(GLenum format, GLenum type,

14
glx/unpack.h
View File

@ -1,10 +1,3 @@
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#ifndef __GLX_unpack_h__
#define __GLX_unpack_h__
/* /*
* SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008) * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
* Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved. * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.
@ -35,6 +28,13 @@
* Silicon Graphics, Inc. * Silicon Graphics, Inc.
*/ */
#ifndef __GLX_unpack_h__
#define __GLX_unpack_h__
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#define __GLX_PAD(s) (((s)+3) & (GLuint)~3) #define __GLX_PAD(s) (((s)+3) & (GLuint)~3)
/* /*