[Fontconfig] fontconfig: Branch 'master'

[Jeremy Huddleston]

 config-fixups.h |    4 ----
 1 file changed, 4 deletions(-)

New commits:
commit 9ec868665dd0f4890b5fb9edb85df8334e5bb689
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date:   Mon Aug 27 14:52:23 2012 -0700

    Remove _CONFIG_FIXUPS_H_ guards, so multiple includes of "config.h" result in the correct values
    
    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>

diff --git a/config-fixups.h b/config-fixups.h
index 0e70846..93ebf5b 100644
--- a/config-fixups.h
+++ b/config-fixups.h
@@ -20,8 +20,6 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-#ifndef _CONFIG_FIXUPS_H_
-#define _CONFIG_FIXUPS_H_
 
 /* This header file is supposed to be included in config.h */
 
@@ -40,5 +38,3 @@
 #  define ALIGNOF_DOUBLE 4
 # endif
 #endif
-
-#endif /* _CONFIG_FIXUPS_H_ */