From b9a19f1ea702446cb176d3f621de331d5c2cc9da Mon Sep 17 00:00:00 2001 From: Kent Mein Date: Mon, 25 Nov 2002 11:16:17 +0000 Subject: Did all of the .h's in source (adding) #ifdef HAVE_CONFIG_H #include #endif also the Makefile.in's were from previous patch adding the system depend stuff to configure.ac Kent -- mein@cs.umn.edu --- source/blender/render/intern/include/RE_DummyShadowBuffer.h | 4 ++++ source/blender/render/intern/include/RE_ShadowBuffer.h | 4 ++++ source/blender/render/intern/include/RE_basicShadowBuffer.h | 4 ++++ source/blender/render/intern/include/RE_callbacks.h | 4 ++++ source/blender/render/intern/include/edgeRender.h | 5 +++++ source/blender/render/intern/include/envmap.h | 4 ++++ source/blender/render/intern/include/errorHandler.h | 4 ++++ source/blender/render/intern/include/gammaCorrectionTables.h | 3 +++ source/blender/render/intern/include/initrender.h | 4 ++++ source/blender/render/intern/include/jitter.h | 4 ++++ source/blender/render/intern/include/old_zbuffer_types.h | 4 ++++ source/blender/render/intern/include/outerRenderLoop.h | 4 ++++ source/blender/render/intern/include/pixelblending.h | 5 +++++ source/blender/render/intern/include/pixelblending_types.h | 4 ++++ source/blender/render/intern/include/pixelshading.h | 4 ++++ source/blender/render/intern/include/renderHelp.h | 4 ++++ source/blender/render/intern/include/renderPreAndPost.h | 4 ++++ source/blender/render/intern/include/render_intern.h | 4 ++++ source/blender/render/intern/include/rendercore.h | 4 ++++ source/blender/render/intern/include/rendercore_int.h | 4 ++++ source/blender/render/intern/include/shadbuf.h | 4 ++++ source/blender/render/intern/include/shadowBuffer.h | 4 ++++ source/blender/render/intern/include/texture.h | 4 ++++ source/blender/render/intern/include/vanillaRenderPipe.h | 4 ++++ source/blender/render/intern/include/vanillaRenderPipe_int.h | 4 ++++ source/blender/render/intern/include/vanillaRenderPipe_types.h | 4 ++++ source/blender/render/intern/include/zbuf.h | 4 ++++ source/blender/render/intern/include/zbuf_int.h | 4 +++- source/blender/render/intern/include/zbuf_types.h | 4 ++++ source/blender/render/intern/include/zbufferdatastruct.h | 4 ++++ source/blender/render/intern/include/zbufferdatastruct_types.h | 4 ++++ 31 files changed, 124 insertions(+), 1 deletion(-) (limited to 'source/blender/render/intern') diff --git a/source/blender/render/intern/include/RE_DummyShadowBuffer.h b/source/blender/render/intern/include/RE_DummyShadowBuffer.h index 2522943fff2..e41651c21c4 100644 --- a/source/blender/render/intern/include/RE_DummyShadowBuffer.h +++ b/source/blender/render/intern/include/RE_DummyShadowBuffer.h @@ -35,6 +35,10 @@ #include "RE_ShadowBuffer.h" +#ifdef HAVE_CONFIG_H +#include +#endif + struct LampRen; class RE_DummyShadowBuffer : public RE_ShadowBuffer { diff --git a/source/blender/render/intern/include/RE_ShadowBuffer.h b/source/blender/render/intern/include/RE_ShadowBuffer.h index c501b3b1b82..36e719a6736 100644 --- a/source/blender/render/intern/include/RE_ShadowBuffer.h +++ b/source/blender/render/intern/include/RE_ShadowBuffer.h @@ -35,6 +35,10 @@ #include +#ifdef HAVE_CONFIG_H +#include +#endif + struct ShadBuf; struct LampRen; diff --git a/source/blender/render/intern/include/RE_basicShadowBuffer.h b/source/blender/render/intern/include/RE_basicShadowBuffer.h index 2bf9fcd1ff0..79f5ffd1ab4 100644 --- a/source/blender/render/intern/include/RE_basicShadowBuffer.h +++ b/source/blender/render/intern/include/RE_basicShadowBuffer.h @@ -35,6 +35,10 @@ #include "RE_ShadowBuffer.h" +#ifdef HAVE_CONFIG_H +#include +#endif + struct LampRen; struct Lamp; diff --git a/source/blender/render/intern/include/RE_callbacks.h b/source/blender/render/intern/include/RE_callbacks.h index 159eaa84ca4..8a53923cb8b 100644 --- a/source/blender/render/intern/include/RE_callbacks.h +++ b/source/blender/render/intern/include/RE_callbacks.h @@ -34,6 +34,10 @@ #ifndef RE_CALLBACKS_H #define RE_CALLBACKS_H +#ifdef HAVE_CONFIG_H +#include +#endif + #ifdef __cplusplus extern "C" { #endif diff --git a/source/blender/render/intern/include/edgeRender.h b/source/blender/render/intern/include/edgeRender.h index ef22ecf51f7..63b0ab1c99d 100644 --- a/source/blender/render/intern/include/edgeRender.h +++ b/source/blender/render/intern/include/edgeRender.h @@ -34,6 +34,11 @@ #ifndef EDGERENDER_H #define EDGERENDER_H + +#ifdef HAVE_CONFIG_H +#include +#endif + /* ------------------------------------------------------------------------- */ /** diff --git a/source/blender/render/intern/include/envmap.h b/source/blender/render/intern/include/envmap.h index 62640454151..89ec76a9f08 100644 --- a/source/blender/render/intern/include/envmap.h +++ b/source/blender/render/intern/include/envmap.h @@ -35,6 +35,10 @@ #ifndef ENVMAP_EXT_H #define ENVMAP_EXT_H +#ifdef HAVE_CONFIG_H +#include +#endif + /* no types!!! */ /* #include "envmap_types.h" */ diff --git a/source/blender/render/intern/include/errorHandler.h b/source/blender/render/intern/include/errorHandler.h index a5fa49bd2c6..4878ba571a5 100644 --- a/source/blender/render/intern/include/errorHandler.h +++ b/source/blender/render/intern/include/errorHandler.h @@ -35,6 +35,10 @@ #ifndef ERRORHANDLER_H #define ERRORHANDLER_H +#ifdef HAVE_CONFIG_H +#include +#endif + /* ------------------------------------------------------------------------- */ /* error codes */ enum RE_RENDER_ERROR { diff --git a/source/blender/render/intern/include/gammaCorrectionTables.h b/source/blender/render/intern/include/gammaCorrectionTables.h index 2ba430c1f3d..2bef629582d 100644 --- a/source/blender/render/intern/include/gammaCorrectionTables.h +++ b/source/blender/render/intern/include/gammaCorrectionTables.h @@ -35,6 +35,9 @@ #ifndef GAMMACORRECTIONTABLES_H #define GAMMACORRECTIONTABLES_H +#ifdef HAVE_CONFIG_H +#include +#endif /* Default gamma. For most CRTs, gamma ranges from 2.2 to 2.5 (Foley), so */ diff --git a/source/blender/render/intern/include/initrender.h b/source/blender/render/intern/include/initrender.h index 06c5f032c7d..79f376aa10c 100644 --- a/source/blender/render/intern/include/initrender.h +++ b/source/blender/render/intern/include/initrender.h @@ -40,6 +40,10 @@ #include "DNA_effect_types.h" /* for PartEff type */ #include "render_types.h" +#ifdef HAVE_CONFIG_H +#include +#endif + /* Functions */ void init_def_material(void); diff --git a/source/blender/render/intern/include/jitter.h b/source/blender/render/intern/include/jitter.h index beae4af0a40..93cef086b75 100644 --- a/source/blender/render/intern/include/jitter.h +++ b/source/blender/render/intern/include/jitter.h @@ -35,6 +35,10 @@ #ifndef JITTER_H #define JITTER_H +#ifdef HAVE_CONFIG_H +#include +#endif + #ifdef __cplusplus extern "C" { #endif diff --git a/source/blender/render/intern/include/old_zbuffer_types.h b/source/blender/render/intern/include/old_zbuffer_types.h index 7d2a38884d8..8280fdf6c77 100644 --- a/source/blender/render/intern/include/old_zbuffer_types.h +++ b/source/blender/render/intern/include/old_zbuffer_types.h @@ -34,6 +34,10 @@ #ifndef OLD_ZBUFFER_TYPES_H #define OLD_ZBUFFER_TYPES_H "$Id$" +#ifdef HAVE_CONFIG_H +#include +#endif + /* ------------------------------------------------------------------------- */ typedef struct PixStr diff --git a/source/blender/render/intern/include/outerRenderLoop.h b/source/blender/render/intern/include/outerRenderLoop.h index 1c0faf666ae..fb46475d70d 100644 --- a/source/blender/render/intern/include/outerRenderLoop.h +++ b/source/blender/render/intern/include/outerRenderLoop.h @@ -35,6 +35,10 @@ #ifndef OUTERRENDERLOOP_H #define OUTERRENDERLOOP_H +#ifdef HAVE_CONFIG_H +#include +#endif + /** * Outer loop for rendering a single picture. */ diff --git a/source/blender/render/intern/include/pixelblending.h b/source/blender/render/intern/include/pixelblending.h index 04fc037865f..316f6dc34dd 100644 --- a/source/blender/render/intern/include/pixelblending.h +++ b/source/blender/render/intern/include/pixelblending.h @@ -42,6 +42,11 @@ /* own include */ #include "pixelblending_types.h" +#ifdef HAVE_CONFIG_H +#include +#endif + + /** * Samples pixel, depending on R.osa setting */ diff --git a/source/blender/render/intern/include/pixelblending_types.h b/source/blender/render/intern/include/pixelblending_types.h index 71e2baa994c..18cd1e0bd70 100644 --- a/source/blender/render/intern/include/pixelblending_types.h +++ b/source/blender/render/intern/include/pixelblending_types.h @@ -36,6 +36,10 @@ #ifndef PIXELBLENDING_TYPES_H #define PIXELBLENDING_TYPES_H +#ifdef HAVE_CONFIG_H +#include +#endif + /* #include "blender.h" */ /* Threshold for a 'full' pixel: pixels with alpha above this level are */ diff --git a/source/blender/render/intern/include/pixelshading.h b/source/blender/render/intern/include/pixelshading.h index ef9e84241f8..45669e8b121 100644 --- a/source/blender/render/intern/include/pixelshading.h +++ b/source/blender/render/intern/include/pixelshading.h @@ -37,6 +37,10 @@ #ifndef PIXELSHADING_H #define PIXELSHADING_H +#ifdef HAVE_CONFIG_H +#include +#endif + /* ------------------------------------------------------------------------- */ #include "render.h" diff --git a/source/blender/render/intern/include/renderHelp.h b/source/blender/render/intern/include/renderHelp.h index 318b538d510..89ace11fa1e 100644 --- a/source/blender/render/intern/include/renderHelp.h +++ b/source/blender/render/intern/include/renderHelp.h @@ -35,6 +35,10 @@ #ifndef RENDERHELP_EXT_H #define RENDERHELP_EXT_H +#ifdef HAVE_CONFIG_H +#include +#endif + #ifdef __cplusplus extern "C" { #endif diff --git a/source/blender/render/intern/include/renderPreAndPost.h b/source/blender/render/intern/include/renderPreAndPost.h index 59315868010..7fef4b2e68e 100644 --- a/source/blender/render/intern/include/renderPreAndPost.h +++ b/source/blender/render/intern/include/renderPreAndPost.h @@ -35,6 +35,10 @@ #ifndef RENDERPREANDPOST_H #define RENDERPREANDPOST_H +#ifdef HAVE_CONFIG_H +#include +#endif + void prepareScene(void); void finalizeScene(void); void doClipping( void (*projectfunc)(float *, float *) ); diff --git a/source/blender/render/intern/include/render_intern.h b/source/blender/render/intern/include/render_intern.h index 25302ad97bd..df0692df0c6 100644 --- a/source/blender/render/intern/include/render_intern.h +++ b/source/blender/render/intern/include/render_intern.h @@ -33,6 +33,10 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ +#ifdef HAVE_CONFIG_H +#include +#endif + /* XXX, should die, no good reason to write * regular (non-file related) endian dependant * code. diff --git a/source/blender/render/intern/include/rendercore.h b/source/blender/render/intern/include/rendercore.h index 8f414936cad..1e0cd77b5c7 100644 --- a/source/blender/render/intern/include/rendercore.h +++ b/source/blender/render/intern/include/rendercore.h @@ -36,6 +36,10 @@ #define RENDERCORE_H #include "render_types.h" +#ifdef HAVE_CONFIG_H +#include +#endif + struct HaloRen; float mistfactor(float *co); /* dist en hoogte, return alpha */ diff --git a/source/blender/render/intern/include/rendercore_int.h b/source/blender/render/intern/include/rendercore_int.h index 45b881fe27f..7c0e402a0b3 100644 --- a/source/blender/render/intern/include/rendercore_int.h +++ b/source/blender/render/intern/include/rendercore_int.h @@ -38,6 +38,10 @@ #include "zbuf_types.h" #include "render_types.h" +#ifdef HAVE_CONFIG_H +#include +#endif + /* float CookTorr(float *n, float *l, float *v, int hard); */ void do_lamphalo_tex(LampRen *lar, float *p1, float *p2, float *intens); void spothalo(struct LampRen *lar, float *view, float *intens); diff --git a/source/blender/render/intern/include/shadbuf.h b/source/blender/render/intern/include/shadbuf.h index 81ec34397cc..6db4aebee7e 100644 --- a/source/blender/render/intern/include/shadbuf.h +++ b/source/blender/render/intern/include/shadbuf.h @@ -35,6 +35,10 @@ #ifndef SHADBUF_EXT_H #define SHADBUF_EXT_H +#ifdef HAVE_CONFIG_H +#include +#endif + #include "render_types.h" #ifdef __cplusplus diff --git a/source/blender/render/intern/include/shadowBuffer.h b/source/blender/render/intern/include/shadowBuffer.h index 46b24573fa8..ae1f1b6f83c 100644 --- a/source/blender/render/intern/include/shadowBuffer.h +++ b/source/blender/render/intern/include/shadowBuffer.h @@ -33,6 +33,10 @@ #ifndef SHADOWBUFFER_H #define SHADOWBUFFER_H +#ifdef HAVE_CONFIG_H +#include +#endif + #ifdef __cplusplus extern "C" { #endif diff --git a/source/blender/render/intern/include/texture.h b/source/blender/render/intern/include/texture.h index aefba4bc372..c10e7a61851 100644 --- a/source/blender/render/intern/include/texture.h +++ b/source/blender/render/intern/include/texture.h @@ -39,6 +39,10 @@ /* no types!!! */ /* #include "texture_types.h" */ +#ifdef HAVE_CONFIG_H +#include +#endif + struct Tex; struct MTex; struct HaloRen; diff --git a/source/blender/render/intern/include/vanillaRenderPipe.h b/source/blender/render/intern/include/vanillaRenderPipe.h index 1ace0c23610..a20e9a98687 100644 --- a/source/blender/render/intern/include/vanillaRenderPipe.h +++ b/source/blender/render/intern/include/vanillaRenderPipe.h @@ -37,6 +37,10 @@ #include "vanillaRenderPipe_types.h" +#ifdef HAVE_CONFIG_H +#include +#endif + /** * Render pipeline with all kinds of extras. * status-------------------------\/ diff --git a/source/blender/render/intern/include/vanillaRenderPipe_int.h b/source/blender/render/intern/include/vanillaRenderPipe_int.h index 980befae66f..e825d4a2189 100644 --- a/source/blender/render/intern/include/vanillaRenderPipe_int.h +++ b/source/blender/render/intern/include/vanillaRenderPipe_int.h @@ -38,6 +38,10 @@ #include "vanillaRenderPipe_types.h" #include "zbufferdatastruct_types.h" +#ifdef HAVE_CONFIG_H +#include +#endif + /** * Z buffer initializer, for new pipeline. *
  • diff --git a/source/blender/render/intern/include/vanillaRenderPipe_types.h b/source/blender/render/intern/include/vanillaRenderPipe_types.h index cf4f2ffb289..a0e1d04554b 100644 --- a/source/blender/render/intern/include/vanillaRenderPipe_types.h +++ b/source/blender/render/intern/include/vanillaRenderPipe_types.h @@ -35,6 +35,10 @@ #ifndef VANILLARENDERPIPE_TYPES_H #define VANILLARENDERPIPE_TYPES_H +#ifdef HAVE_CONFIG_H +#include +#endif + /* Render defines */ #define RE_MAX_OSA_COUNT 16 /* The max. number of possible oversamples */ #define RE_MAX_FACES_PER_PIXEL 500 /* max. nr of faces rendered behind one */ diff --git a/source/blender/render/intern/include/zbuf.h b/source/blender/render/intern/include/zbuf.h index fdfa5b19abe..10e00415d44 100644 --- a/source/blender/render/intern/include/zbuf.h +++ b/source/blender/render/intern/include/zbuf.h @@ -36,6 +36,10 @@ #ifndef ZBUF_H #define ZBUF_H +#ifdef HAVE_CONFIG_H +#include +#endif + #ifdef __cplusplus extern "C" { #endif diff --git a/source/blender/render/intern/include/zbuf_int.h b/source/blender/render/intern/include/zbuf_int.h index a9d7820565c..3d442daca1d 100644 --- a/source/blender/render/intern/include/zbuf_int.h +++ b/source/blender/render/intern/include/zbuf_int.h @@ -40,7 +40,9 @@ #include "render_types.h" #include "zbuf_types.h" - +#ifdef HAVE_CONFIG_H +#include +#endif /** * Convert a homogenous coordinate to a z buffer coordinate. The diff --git a/source/blender/render/intern/include/zbuf_types.h b/source/blender/render/intern/include/zbuf_types.h index b5ad9c75902..fa3e5cdb9e0 100644 --- a/source/blender/render/intern/include/zbuf_types.h +++ b/source/blender/render/intern/include/zbuf_types.h @@ -36,6 +36,10 @@ #ifndef ZBUF_TYPES_H #define ZBUF_TYPES_H +#ifdef HAVE_CONFIG_H +#include +#endif + #ifdef __cplusplus extern "C" { #endif diff --git a/source/blender/render/intern/include/zbufferdatastruct.h b/source/blender/render/intern/include/zbufferdatastruct.h index 790cce2cb77..f5bd2a409c7 100644 --- a/source/blender/render/intern/include/zbufferdatastruct.h +++ b/source/blender/render/intern/include/zbufferdatastruct.h @@ -37,6 +37,10 @@ #include "zbufferdatastruct_types.h" +#ifdef HAVE_CONFIG_H +#include +#endif + /** * Set memory and counters for a fresh z buffer */ diff --git a/source/blender/render/intern/include/zbufferdatastruct_types.h b/source/blender/render/intern/include/zbufferdatastruct_types.h index 0607f19bbc9..35351a63869 100644 --- a/source/blender/render/intern/include/zbufferdatastruct_types.h +++ b/source/blender/render/intern/include/zbufferdatastruct_types.h @@ -35,6 +35,10 @@ #ifndef ZBUFFERDATASTRUCT_TYPES_H #define ZBUFFERDATASTRUCT_TYPES_H +#ifdef HAVE_CONFIG_H +#include +#endif + #define RE_ZBUFLEN 64 /* number of lines in the accumulation buffer */ /** -- cgit v1.2.3