xfree86: xf86Config: consolidate xf86configptr declarations
Instead of having several separate exern declarations in various source files, using one central one xf86Config.h Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
		
							parent
							
								
									8fb5e2e589
								
							
						
					
					
						commit
						540448bc83
					
				| 
						 | 
					@ -37,12 +37,10 @@
 | 
				
			||||||
#include "xf86Parser.h"
 | 
					#include "xf86Parser.h"
 | 
				
			||||||
#include "xf86str.h"
 | 
					#include "xf86str.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#ifdef HAVE_PARSER_DECLS
 | 
					 | 
				
			||||||
/*
 | 
					/*
 | 
				
			||||||
 * global structure that holds the result of parsing the config file
 | 
					 * global structure that holds the result of parsing the config file
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
extern XF86ConfigPtr xf86configptr;
 | 
					extern XF86ConfigPtr xf86configptr;
 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
typedef enum _ConfigStatus {
 | 
					typedef enum _ConfigStatus {
 | 
				
			||||||
    CONFIG_OK = 0,
 | 
					    CONFIG_OK = 0,
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -34,6 +34,7 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "xf86.h"
 | 
					#include "xf86.h"
 | 
				
			||||||
#include "xf86DDC_priv.h"
 | 
					#include "xf86DDC_priv.h"
 | 
				
			||||||
 | 
					#include "xf86Config.h"
 | 
				
			||||||
#include "xf86Crtc.h"
 | 
					#include "xf86Crtc.h"
 | 
				
			||||||
#include "xf86Modes.h"
 | 
					#include "xf86Modes.h"
 | 
				
			||||||
#include "xf86Opt_priv.h"
 | 
					#include "xf86Opt_priv.h"
 | 
				
			||||||
| 
						 | 
					@ -460,8 +461,6 @@ xf86CrtcSetOrigin(xf86CrtcPtr crtc, int x, int y)
 | 
				
			||||||
 * Output functions
 | 
					 * Output functions
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
extern XF86ConfigPtr xf86configptr;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
typedef enum {
 | 
					typedef enum {
 | 
				
			||||||
    OPTION_PREFERRED_MODE,
 | 
					    OPTION_PREFERRED_MODE,
 | 
				
			||||||
    OPTION_ZOOM_MODES,
 | 
					    OPTION_ZOOM_MODES,
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -30,11 +30,11 @@
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include <libxcvt/libxcvt.h>
 | 
					#include <libxcvt/libxcvt.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include "xf86Config.h"
 | 
				
			||||||
#include "xf86Modes.h"
 | 
					#include "xf86Modes.h"
 | 
				
			||||||
#include "xf86Priv.h"
 | 
					#include "xf86Priv.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
extern XF86ConfigPtr xf86configptr;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 * Calculates the horizontal sync rate of a mode.
 | 
					 * Calculates the horizontal sync rate of a mode.
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue