From 7e9105bca0dc643841376f6c06f2e661ad4eaa2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim.muller@collabora.co.uk>
Date: Wed, 10 Jun 2009 20:29:41 +0100
Subject: [PATCH] Make sure config.h is only included once

Fixes build problem on win32 (#585075).
---
 gst/gst_private.h       | 2 ++
 gst/gstregistrybinary.h | 4 ----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/gst/gst_private.h b/gst/gst_private.h
index ce65f5c33a..b16242ebaa 100644
--- a/gst/gst_private.h
+++ b/gst/gst_private.h
@@ -24,7 +24,9 @@
 #define __GST_PRIVATE_H__
 
 #ifdef HAVE_CONFIG_H
+# ifndef GST_LICENSE   /* don't include config.h twice, it has no guards */
 #  include "config.h"
+# endif
 #endif
 
 /* This needs to be before glib.h, since it might be used in inline
diff --git a/gst/gstregistrybinary.h b/gst/gstregistrybinary.h
index a6ceab2313..18e150cecd 100644
--- a/gst/gstregistrybinary.h
+++ b/gst/gstregistrybinary.h
@@ -33,10 +33,6 @@
 #include <gst/gstpad.h>
 #include <gst/gstregistry.h>
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 /*
  * GST_MAGIC_BINARY_REGISTRY_STR:
  *