From: Andy Wingo Date: Fri, 11 Aug 2006 15:26:33 +0000 (+0000) Subject: GST_DISABLE_DEPRECATED is only for users of API that don't want to see deprecated... X-Git-Tag: RELEASE-0_10_10~66 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=86b76f4c229f20693aaa7a46d6b1adbe5ac64314;p=platform%2Fupstream%2Fgstreamer.git GST_DISABLE_DEPRECATED is only for users of API that don't want to see deprecated functions in the headers; people th... Original commit message from CVS: 2006-08-11 Andy Wingo * configure.ac: * libs/gst/dataprotocol/dataprotocol.c: (gst_dp_packetizer_new): * tests/check/libs/gdp.c: (gst_dp_suite): GST_DISABLE_DEPRECATED is only for users of API that don't want to see deprecated functions in the headers; people that want to compile out deprecated code should pass -DGST_REMOVE_DEPRECATED into the CFLAGS. Fixes the build of multifdsink, or will soon.. --- diff --git a/ChangeLog b/ChangeLog index c0895e7..321b22c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2006-08-11 Andy Wingo + + * configure.ac: + * libs/gst/dataprotocol/dataprotocol.c: (gst_dp_packetizer_new): + * tests/check/libs/gdp.c: (gst_dp_suite): GST_DISABLE_DEPRECATED + is only for users of API that don't want to see deprecated + functions in the headers; people that want to compile out + deprecated code should pass -DGST_REMOVE_DEPRECATED into the + CFLAGS. Fixes the build of multifdsink, or will soon.. + 2006-08-11 Wim Taymans * docs/gst/gstreamer-sections.txt: diff --git a/configure.ac b/configure.ac index 99454e1..128a820 100644 --- a/configure.ac +++ b/configure.ac @@ -414,6 +414,9 @@ if test "x$USE_DEBUG" = xyes; then fi AC_SUBST(PROFILE_CFLAGS) +# GST_DISABLE_DEPRECATED: hide the visibility of deprecated +# functionality from the API that gstreamer uses +# GST_REMOVE_DEPRECATED: don't compile deprecated functionality (breaks ABI) DEPRECATED_CFLAGS="-DGST_DISABLE_DEPRECATED" AC_SUBST(DEPRECATED_CFLAGS) diff --git a/libs/gst/dataprotocol/dataprotocol.c b/libs/gst/dataprotocol/dataprotocol.c index fa80636..7b9ec2b 100644 --- a/libs/gst/dataprotocol/dataprotocol.c +++ b/libs/gst/dataprotocol/dataprotocol.c @@ -380,7 +380,7 @@ gst_dp_header_payload_type (const guint8 * header) * * Returns: %TRUE if the header was successfully created. */ -#ifndef GST_DISABLE_DEPRECATED +#ifndef GST_REMOVE_DEPRECATED gboolean gst_dp_header_from_buffer (const GstBuffer * buffer, GstDPHeaderFlag flags, guint * length, guint8 ** header) @@ -412,7 +412,7 @@ gst_dp_header_from_buffer_1_0 (const GstBuffer * buffer, GstDPHeaderFlag flags, * * Returns: %TRUE if the packet was successfully created. */ -#ifndef GST_DISABLE_DEPRECATED +#ifndef GST_REMOVE_DEPRECATED gboolean gst_dp_packet_from_caps (const GstCaps * caps, GstDPHeaderFlag flags, guint * length, guint8 ** header, guint8 ** payload) @@ -444,7 +444,7 @@ gst_dp_packet_from_caps_1_0 (const GstCaps * caps, GstDPHeaderFlag flags, * * Returns: %TRUE if the packet was successfully created. */ -#ifndef GST_DISABLE_DEPRECATED +#ifndef GST_REMOVE_DEPRECATED gboolean gst_dp_packet_from_event (const GstEvent * event, GstDPHeaderFlag flags, guint * length, guint8 ** header, guint8 ** payload) @@ -875,7 +875,7 @@ gst_dp_packetizer_new (GstDPVersion version) ret->version = version; switch (version) { -#ifndef GST_DISABLE_DEPRECATED +#ifndef GST_REMOVE_DEPRECATED case GST_DP_VERSION_0_2: ret->header_from_buffer = gst_dp_header_from_buffer; ret->packet_from_caps = gst_dp_packet_from_caps; diff --git a/tests/check/libs/gdp.c b/tests/check/libs/gdp.c index a734a22..60ca2d6 100644 --- a/tests/check/libs/gdp.c +++ b/tests/check/libs/gdp.c @@ -24,6 +24,10 @@ #include +#ifndef GST_REMOVE_DEPRECATED +#undef GST_DISABLE_DEPRECATED +#endif + #include #include "libs/gst/dataprotocol/dp-private.h" /* private header */ @@ -85,7 +89,7 @@ GST_START_TEST (test_conversion) GST_END_TEST; -#ifndef GST_DISABLE_DEPRECATED /* these tests use deprecated API, that we disable by default */ +#ifndef GST_REMOVE_DEPRECATED /* these tests use deprecated API, that we disable by default */ #ifndef HAVE_CPU_PPC64 /* this test doesn't work on PPC64. See #348114 */ @@ -413,7 +417,7 @@ gst_dp_suite (void) suite_add_tcase (s, tc_chain); tcase_add_test (tc_chain, test_conversion); -#ifndef GST_DISABLE_DEPRECATED +#ifndef GST_REMOVE_DEPRECATED #ifndef HAVE_CPU_PPC64 tcase_add_test (tc_chain, test_buffer); #endif diff --git a/win32/common/config.h b/win32/common/config.h index 3719e6f..47ee17d 100644 --- a/win32/common/config.h +++ b/win32/common/config.h @@ -175,7 +175,7 @@ #define HAVE_WIN32 1 /* Define host CPU */ -#define HOST_CPU "i686" +#define HOST_CPU "x86_64" /* library dir */ #ifdef _DEBUG