mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-06-07 07:58:51 +00:00
Make sure config.h is only included once
Fixes build problem on win32 (#585075).
This commit is contained in:
parent
094d71f004
commit
7e9105bca0
2 changed files with 2 additions and 4 deletions
|
@ -24,7 +24,9 @@
|
||||||
#define __GST_PRIVATE_H__
|
#define __GST_PRIVATE_H__
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
|
# ifndef GST_LICENSE /* don't include config.h twice, it has no guards */
|
||||||
# include "config.h"
|
# include "config.h"
|
||||||
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* This needs to be before glib.h, since it might be used in inline
|
/* This needs to be before glib.h, since it might be used in inline
|
||||||
|
|
|
@ -33,10 +33,6 @@
|
||||||
#include <gst/gstpad.h>
|
#include <gst/gstpad.h>
|
||||||
#include <gst/gstregistry.h>
|
#include <gst/gstregistry.h>
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
|
||||||
#include "config.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* GST_MAGIC_BINARY_REGISTRY_STR:
|
* GST_MAGIC_BINARY_REGISTRY_STR:
|
||||||
*
|
*
|
||||||
|
|
Loading…
Reference in a new issue