strip out vestigial #ifdef HAVE_CONFIG_H stanzas, they're confusing the
modular X build
This commit is contained in:
parent
8d3aca655e
commit
c529f6bf70
|
@ -31,14 +31,8 @@
|
|||
#include <GL/vms_x_fix.h>
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "conf.h"
|
||||
#endif
|
||||
|
||||
|
||||
#include "glheader.h"
|
||||
|
||||
|
||||
#ifdef XFree86Server
|
||||
|
||||
# include "resource.h"
|
||||
|
|
|
@ -31,11 +31,6 @@
|
|||
#ifndef CONFIG_H
|
||||
#define CONFIG_H
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "conf.h"
|
||||
#endif
|
||||
|
||||
|
||||
/**
|
||||
* \name OpenGL implementation limits
|
||||
*/
|
||||
|
|
|
@ -70,11 +70,6 @@
|
|||
#include <stdarg.h>
|
||||
|
||||
|
||||
/* This is no longer uses since we dumped autoconf/automake! */
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "conf.h"
|
||||
#endif
|
||||
|
||||
/* Get typedefs for uintptr_t and friends */
|
||||
#if defined(_WIN32)
|
||||
#include <BaseTsd.h>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: common_x86_asm.h,v 1.11 2004/04/26 10:10:25 alanh Exp $ */
|
||||
/* $Id: common_x86_asm.h,v 1.12 2005/07/16 00:56:20 ajax Exp $ */
|
||||
|
||||
/*
|
||||
* Mesa 3-D graphics library
|
||||
|
@ -43,10 +43,6 @@
|
|||
*/
|
||||
#include "common_x86_features.h"
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "conf.h"
|
||||
#endif
|
||||
|
||||
#ifdef USE_X86_ASM
|
||||
#include "x86.h"
|
||||
#ifdef USE_3DNOW_ASM
|
||||
|
|
Loading…
Reference in New Issue