Xext: securitysrv.h: drop hacks for including secur.h
The secur.h doesn't need the symbols defined here (eg. Status or Display) anymore, so no need to keep it around anymore. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net> Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1550>
This commit is contained in:
		
							parent
							
								
									224fa46f26
								
							
						
					
					
						commit
						c77bcb9f7f
					
				| 
						 | 
					@ -30,27 +30,8 @@ from The Open Group.
 | 
				
			||||||
#ifndef _SECURITY_SRV_H
 | 
					#ifndef _SECURITY_SRV_H
 | 
				
			||||||
#define _SECURITY_SRV_H
 | 
					#define _SECURITY_SRV_H
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Allow client side portions of <X11/extensions/security.h> to compile */
 | 
					 | 
				
			||||||
#ifndef Status
 | 
					 | 
				
			||||||
#define Status int
 | 
					 | 
				
			||||||
#define NEED_UNDEF_Status
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
#ifndef Display
 | 
					 | 
				
			||||||
#define Display void
 | 
					 | 
				
			||||||
#define NEED_UNDEF_Display
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#include <X11/extensions/secur.h>
 | 
					#include <X11/extensions/secur.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#ifdef NEED_UNDEF_Status
 | 
					 | 
				
			||||||
#undef Status
 | 
					 | 
				
			||||||
#undef NEED_UNDEF_Status
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
#ifdef NEED_UNDEF_Display
 | 
					 | 
				
			||||||
#undef Display
 | 
					 | 
				
			||||||
#undef NEED_UNDEF_Display
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#include "input.h"              /* for DeviceIntPtr */
 | 
					#include "input.h"              /* for DeviceIntPtr */
 | 
				
			||||||
#include "property.h"           /* for PropertyPtr */
 | 
					#include "property.h"           /* for PropertyPtr */
 | 
				
			||||||
#include "pixmap.h"             /* for DrawablePtr */
 | 
					#include "pixmap.h"             /* for DrawablePtr */
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue