Attachment 3363 Details for Bug 4468 – Move system headers to imports.h

[patch] Move system headers to imports.h

mesa-sys-hdr.patch (text/plain), 4.79 KB, created by George - on 2005-09-22 04:09:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: George -

Created: 2005-09-22 04:09:50 UTC

Size: 4.79 KB

patch

obsolete

>Index: src/mesa/main/glheader.h
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/main/glheader.h,v
>retrieving revision 1.65
>diff -u -r1.65 glheader.h
>--- src/mesa/main/glheader.h	19 Sep 2005 20:12:33 -0000	1.65
>+++ src/mesa/main/glheader.h	22 Sep 2005 10:53:31 -0000
>@@ -47,29 +47,6 @@
> #define GLHEADER_H
> 
> 
>-#if defined(XFree86LOADER) && defined(IN_MODULE)
>-#include "xf86_ansic.h"
>-#else
>-#include <assert.h>
>-#include <ctype.h>
>-/* If we can use Compaq's Fast Math Library on Alpha */
>-#if defined(__alpha__) && defined(CCPML)
>-#include <cpml.h>
>-#else
>-#include <math.h>
>-#endif
>-#include <limits.h>
>-#include <stdlib.h>
>-#include <stdio.h>
>-#include <string.h>
>-#if defined(__linux__) && defined(__i386__)
>-#include <fpu_control.h>
>-#endif
>-#endif
>-#include <float.h>
>-#include <stdarg.h>
>-
>-
> /* Get typedefs for uintptr_t and friends */
> #if defined(_WIN32)
> #include <BaseTsd.h>
>@@ -79,6 +56,8 @@
> #if defined(__MINGW32__)
> #include <stdint.h>
> #endif
>+#elif IN_DRI_DRIVER /* defined(__linux__) || defined(__FreeBSD__) */
>+#include <stdint.h>
> #else
> #include <inttypes.h>
> #endif
>@@ -227,6 +206,7 @@
> #endif
> 
> 
>+#include <assert.h>
> #if defined(BUILD_FOR_SNAP) && defined(CHECKED)
> #  define ASSERT(X)   _CHECK(X) 
> #elif defined(DEBUG)
>Index: src/mesa/main/imports.h
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/main/imports.h,v
>retrieving revision 1.57
>diff -u -r1.57 imports.h
>--- src/mesa/main/imports.h	19 Sep 2005 20:12:33 -0000	1.57
>+++ src/mesa/main/imports.h	22 Sep 2005 10:53:33 -0000
>@@ -36,6 +36,27 @@
> #define IMPORTS_H
> 
> 
>+#if defined(XFree86LOADER) && defined(IN_MODULE)
>+#include "xf86_ansic.h"
>+#else
>+#include <ctype.h>
>+#if defined(__alpha__) && defined(CCPML)
>+#include <cpml.h> /* Compaq's Fast Math Library on Alpha */
>+#else
>+#include <math.h>
>+#endif
>+#include <limits.h>
>+#include <stdlib.h>
>+#include <stdio.h>
>+#include <string.h>
>+#if defined(__linux__) && defined(__i386__)
>+#include <fpu_control.h>
>+#endif
>+#endif
>+#include <float.h>
>+#include <stdarg.h>
>+
>+
> /* XXX some of the stuff in glheader.h should be moved into this file.
>  */
> #include "glheader.h"
>@@ -129,12 +150,6 @@
> #define M_E (2.7182818284590452354)
> #endif
> 
>-
>-/* XXX this is a bit of a hack needed for compilation within XFree86 */
>-#ifndef FLT_MIN
>-#define FLT_MIN (1.0e-37)
>-#endif
>-
> /* Degrees to radians conversion: */
> #define DEG2RAD (M_PI/180.0)
> 
>@@ -643,9 +658,6 @@
> extern double
> _mesa_pow(double x, double y);
> 
>-extern float
>-_mesa_log2(float x);
>-
> extern int
> _mesa_ffs(int i);
> 
>Index: src/mesa/swrast/s_tcc.c
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/swrast/s_tcc.c,v
>retrieving revision 1.4
>diff -u -r1.4 s_tcc.c
>--- src/mesa/swrast/s_tcc.c	16 Sep 2005 04:16:48 -0000	1.4
>+++ src/mesa/swrast/s_tcc.c	22 Sep 2005 10:53:38 -0000
>@@ -29,11 +29,8 @@
>  * end up using it as a backend in mesa.
>  */
> 
>-#include <stdlib.h>
>-#include <stdio.h>
>-
>-
> #include "glheader.h"
>+#include "imports.h"
> #include "colormac.h"
> #include "context.h"
> #include "nvfragprog.h"
>Index: src/mesa/x86/gen_matypes.c
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/x86/gen_matypes.c,v
>retrieving revision 1.14
>diff -u -r1.14 gen_matypes.c
>--- src/mesa/x86/gen_matypes.c	7 May 2005 16:59:58 -0000	1.14
>+++ src/mesa/x86/gen_matypes.c	22 Sep 2005 10:53:39 -0000
>@@ -32,6 +32,7 @@
>  * Mesa, including lighting, clipping, texture image conversion etc.
>  */
> 
>+#include <stdio.h>
> #include "main/glheader.h"
> #include "main/mtypes.h"
> #include "tnl/t_context.h"
>Index: src/mesa/glapi/glapi.c
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/glapi/glapi.c,v
>retrieving revision 1.95
>diff -u -r1.95 glapi.c
>--- src/mesa/glapi/glapi.c	10 Aug 2005 23:54:15 -0000	1.95
>+++ src/mesa/glapi/glapi.c	22 Sep 2005 10:53:29 -0000
>@@ -50,6 +50,14 @@
> 
> 
> 
>+/* glapi cannot include imports.h because for DRI it is part of libGL */
>+#if defined(XFree86LOADER) && defined(IN_MODULE)
>+#include "xf86_ansic.h"
>+#else
>+#include <stdlib.h>
>+#include <string.h>
>+#endif
>+
> #include "glheader.h"
> #include "glapi.h"
> #include "glapioffsets.h"
>Index: src/mesa/glapi/glthread.c
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/glapi/glthread.c,v
>retrieving revision 1.12
>diff -u -r1.12 glthread.c
>--- src/mesa/glapi/glthread.c	3 Aug 2005 23:05:25 -0000	1.12
>+++ src/mesa/glapi/glthread.c	22 Sep 2005 10:53:29 -0000
>@@ -30,6 +30,14 @@
>  */
> 
> 
>+/* glapi cannot include imports.h because for DRI it is part of libGL */
>+#if defined(XFree86LOADER) && defined(IN_MODULE)
>+#include "xf86_ansic.h"
>+#else
>+#include <stdlib.h>
>+#include <stdio.h>
>+#endif
>+
> #include "glheader.h"
> #include "glthread.h"
>

Actions: View | Splinter Review

Attachments on bug 4468: 3290 | 3301 | 3306 | 3315 | 3363 | 3364 | 3547

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.