Bug #2901 <https://bugs.freedesktop.org/show_bug.cgi?id=2901> Fix warnings
about redefined macros (Peter Breitenlohner)
This commit is contained in:
		
							parent
							
								
									f86562540d
								
							
						
					
					
						commit
						7da3f4a786
					
				| 
						 | 
					@ -36,7 +36,9 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#else
 | 
					#else
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#ifndef XFree86LOADER
 | 
				
			||||||
#define XFree86LOADER		/* not really */
 | 
					#define XFree86LOADER		/* not really */
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
#define IN_LOADER
 | 
					#define IN_LOADER
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "xf86.h"
 | 
					#include "xf86.h"
 | 
				
			||||||
| 
						 | 
					@ -44,7 +46,9 @@
 | 
				
			||||||
#include "xf86Opt.h"
 | 
					#include "xf86Opt.h"
 | 
				
			||||||
#include "xf86Module.h"
 | 
					#include "xf86Module.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#ifndef XINPUT
 | 
				
			||||||
#define XINPUT
 | 
					#define XINPUT
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
#include "xf86Xinput.h"
 | 
					#include "xf86Xinput.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include <X11/fonts/fontmod.h>
 | 
					#include <X11/fonts/fontmod.h>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue