(submit/move-systemd-logind.h) move systemd-logind.h to hw/xfree86/os-support/linux
systemd is linux specific and the actual implementation is under the os-support layer of xfree86 ddx. Thus no need to keep it in global include directory, putting it onto the linux specific os-support instead. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
		
							parent
							
								
									0fbca1cf56
								
							
						
					
					
						commit
						cc2ad2e3e5
					
				| 
						 | 
				
			
			@ -32,7 +32,8 @@
 | 
			
		|||
#include "os.h"
 | 
			
		||||
#include "inputstr.h"
 | 
			
		||||
#include "config-backends.h"
 | 
			
		||||
#include "systemd-logind.h"
 | 
			
		||||
 | 
			
		||||
#include "../hw/xfree86/os-support/linux/systemd-logind.h"
 | 
			
		||||
 | 
			
		||||
void
 | 
			
		||||
config_pre_init(void)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -36,7 +36,8 @@
 | 
			
		|||
#include "config-backends.h"
 | 
			
		||||
#include "os.h"
 | 
			
		||||
#include "globals.h"
 | 
			
		||||
#include "systemd-logind.h"
 | 
			
		||||
 | 
			
		||||
#include "../hw/xfree86/os-support/linux/systemd-logind.h"
 | 
			
		||||
 | 
			
		||||
#ifdef HAVE_SYS_SYSMACROS_H
 | 
			
		||||
#include <sys/sysmacros.h>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -53,7 +53,7 @@
 | 
			
		|||
 | 
			
		||||
/* This stub can be safely removed once we can
 | 
			
		||||
 * split input and GPU parts in hotplug.h et al. */
 | 
			
		||||
#include <systemd-logind.h>
 | 
			
		||||
#include "../../xfree86/os-support/linux/systemd-logind.h"
 | 
			
		||||
 | 
			
		||||
typedef struct _kdDepths {
 | 
			
		||||
    CARD8 depth;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -91,7 +91,8 @@
 | 
			
		|||
#endif
 | 
			
		||||
 | 
			
		||||
#include "xf86platformBus.h"
 | 
			
		||||
#include "systemd-logind.h"
 | 
			
		||||
 | 
			
		||||
#include "../os-support/linux/systemd-logind.h"
 | 
			
		||||
 | 
			
		||||
extern void (*xf86OSPMClose) (void);
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -63,7 +63,7 @@
 | 
			
		|||
#include "windowstr.h"
 | 
			
		||||
#include "scrnintstr.h"
 | 
			
		||||
#include "mi.h"
 | 
			
		||||
#include "systemd-logind.h"
 | 
			
		||||
#include "../os-support/linux/systemd-logind.h"
 | 
			
		||||
#include "xf86VGAarbiter_priv.h"
 | 
			
		||||
#include "loaderProcs.h"
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -69,7 +69,7 @@
 | 
			
		|||
#include "xf86Optrec.h"
 | 
			
		||||
#include "mipointer.h"
 | 
			
		||||
#include "loaderProcs.h"
 | 
			
		||||
#include "systemd-logind.h"
 | 
			
		||||
#include "../os-support/linux/systemd-logind.h"
 | 
			
		||||
#include "exevents.h"           /* AddInputDevice */
 | 
			
		||||
#include "exglobals.h"
 | 
			
		||||
#include "eventstr.h"
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -41,7 +41,7 @@
 | 
			
		|||
#include "dix/screenint_priv.h"
 | 
			
		||||
 | 
			
		||||
#include "os.h"
 | 
			
		||||
#include "systemd-logind.h"
 | 
			
		||||
#include "../os-support/linux/systemd-logind.h"
 | 
			
		||||
 | 
			
		||||
#include "loaderProcs.h"
 | 
			
		||||
#include "xf86.h"
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -20,7 +20,7 @@
 | 
			
		|||
#include "xf86platformBus.h"
 | 
			
		||||
#include "xf86Bus.h"
 | 
			
		||||
 | 
			
		||||
#include "systemd-logind.h"
 | 
			
		||||
#include "../linux/systemd-logind.h"
 | 
			
		||||
 | 
			
		||||
static Bool
 | 
			
		||||
get_drm_info(struct OdevAttributes *attribs, char *path, int delayed_index)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue