From 694e3c42985cdbfc27e3ce1d65b53bbdf82c606c Mon Sep 17 00:00:00 2001 From: Markus Hitter Date: Sun, 27 Feb 2011 11:01:40 +0100 Subject: [PATCH] Revert "Config templates: protect config.h against multiple inclusion." Teacup uses preprocessor magic which actually requires including config.h twice. This reverts commit c61191d86df3992131742eba61964524a77785be. --- config.gen3.h | 5 +---- config.gen6.h | 5 +---- config.h.dist | 5 +---- config.ramps.h | 5 +---- 4 files changed, 4 insertions(+), 16 deletions(-) diff --git a/config.gen3.h b/config.gen3.h index 18530d8..6e42790 100644 --- a/config.gen3.h +++ b/config.gen3.h @@ -1,5 +1,4 @@ -#ifndef _CONFIG_H -#define _CONFIG_H +/* Notice to developers: this file is intentionally included twice. */ /* CONTENTS @@ -422,5 +421,3 @@ DEFINE_TEMP_SENSOR(noheater, TT_INTERCOM, 0) * OCR5CL - PL5 - DIO44 * * * \***************************************************************************/ - -#endif /* _CONFIG_H */ diff --git a/config.gen6.h b/config.gen6.h index 415a839..2301728 100644 --- a/config.gen6.h +++ b/config.gen6.h @@ -1,5 +1,4 @@ -#ifndef _CONFIG_H -#define _CONFIG_H +/* Notice to developers: this file is intentionally included twice. */ /* Sample configuration file for the GEN6-Board sold by Camiel Gubbels. @@ -411,5 +410,3 @@ DEFINE_HEATER(extruder, PORTD, PIND6, OCR2B) * OCR5CL - PL5 - DIO44 * * * \***************************************************************************/ - -#endif /* _CONFIG_H */ diff --git a/config.h.dist b/config.h.dist index 7c0ea11..de64e2f 100644 --- a/config.h.dist +++ b/config.h.dist @@ -1,5 +1,4 @@ -#ifndef _CONFIG_H -#define _CONFIG_H +/* Notice to developers: this file is intentionally included twice. */ /* CONTENTS @@ -439,5 +438,3 @@ DEFINE_HEATER(bed, PORTB, PINB4, OCR0B) * OCR5CL - PL5 - DIO44 * * * \***************************************************************************/ - -#endif /* _CONFIG_H */ diff --git a/config.ramps.h b/config.ramps.h index 70107be..f5d81a9 100644 --- a/config.ramps.h +++ b/config.ramps.h @@ -1,5 +1,4 @@ -#ifndef _CONFIG_H -#define _CONFIG_H +/* Notice to developers: this file is intentionally included twice. */ /* CONTENTS @@ -425,5 +424,3 @@ DEFINE_HEATER(fan, PORTH, PINH6, OCR2B) * OCR5CL - PL5 - DIO44 * * * \***************************************************************************/ - -#endif /* _CONFIG_H */