From 6af410ba9f7831bb01f3f0e0a339b3af618791d9 Mon Sep 17 00:00:00 2001 From: Tobias Weimer Date: Tue, 25 Dec 2012 20:45:59 +0000 Subject: compile fixes git-svn-id: http://svn.miranda-ng.org/main/trunk@2847 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- .../src/players/foo_mlt/foo_mlt_10.vcxproj | 8 +- .../src/players/foo_mlt/foo_mlt_11.vcxproj | 8 +- plugins/ListeningTo/src/players/foo_mlt/pfc/pfc.h | 172 +++++++++++++++++++++ .../ListeningTo/src/players/foo_mlt/pfc/pfc_10.h | 172 --------------------- 4 files changed, 180 insertions(+), 180 deletions(-) create mode 100644 plugins/ListeningTo/src/players/foo_mlt/pfc/pfc.h delete mode 100644 plugins/ListeningTo/src/players/foo_mlt/pfc/pfc_10.h (limited to 'plugins/ListeningTo') diff --git a/plugins/ListeningTo/src/players/foo_mlt/foo_mlt_10.vcxproj b/plugins/ListeningTo/src/players/foo_mlt/foo_mlt_10.vcxproj index 5f6e03e912..23e3d3d82a 100644 --- a/plugins/ListeningTo/src/players/foo_mlt/foo_mlt_10.vcxproj +++ b/plugins/ListeningTo/src/players/foo_mlt/foo_mlt_10.vcxproj @@ -139,19 +139,19 @@ - + {71ad2674-065b-48f5-b8b0-e1f9d3892081} false - + {ee47764e-a202-4f85-a767-abdab4aff35f} false - + {e8091321-d79d-4575-86ef-064ea1a4a20d} false - + {ebfffb4e-261d-44d3-b89c-957b31a0bf9c} false diff --git a/plugins/ListeningTo/src/players/foo_mlt/foo_mlt_11.vcxproj b/plugins/ListeningTo/src/players/foo_mlt/foo_mlt_11.vcxproj index 5f6e03e912..96e433b6fd 100644 --- a/plugins/ListeningTo/src/players/foo_mlt/foo_mlt_11.vcxproj +++ b/plugins/ListeningTo/src/players/foo_mlt/foo_mlt_11.vcxproj @@ -139,19 +139,19 @@ - + {71ad2674-065b-48f5-b8b0-e1f9d3892081} false - + {ee47764e-a202-4f85-a767-abdab4aff35f} false - + {e8091321-d79d-4575-86ef-064ea1a4a20d} false - + {ebfffb4e-261d-44d3-b89c-957b31a0bf9c} false diff --git a/plugins/ListeningTo/src/players/foo_mlt/pfc/pfc.h b/plugins/ListeningTo/src/players/foo_mlt/pfc/pfc.h new file mode 100644 index 0000000000..408fcd54d3 --- /dev/null +++ b/plugins/ListeningTo/src/players/foo_mlt/pfc/pfc.h @@ -0,0 +1,172 @@ +#ifndef ___PFC_H___ +#define ___PFC_H___ + +#if !defined(_WINDOWS) && (defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64) || defined(_WIN32_WCE)) +#define _WINDOWS +#endif + + +#define PFC_DLL_EXPORT + +#ifdef _WINDOWS + +#ifndef STRICT +#define STRICT +#endif + +#ifndef _SYS_GUID_OPERATOR_EQ_ +#define _NO_SYS_GUID_OPERATOR_EQ_ //fix retarded warning with operator== on GUID returning int +#endif + +#ifndef _WIN32_WINNT +#define _WIN32_WINNT 0x500 +#endif + +#include + +#ifndef _SYS_GUID_OPERATOR_EQ_ +__inline bool __InlineIsEqualGUID(REFGUID rguid1, REFGUID rguid2) +{ + return ( + ((unsigned long *) &rguid1)[0] == ((unsigned long *) &rguid2)[0] && + ((unsigned long *) &rguid1)[1] == ((unsigned long *) &rguid2)[1] && + ((unsigned long *) &rguid1)[2] == ((unsigned long *) &rguid2)[2] && + ((unsigned long *) &rguid1)[3] == ((unsigned long *) &rguid2)[3]); +} + +inline bool operator==(REFGUID guidOne, REFGUID guidOther) {return __InlineIsEqualGUID(guidOne,guidOther);} +inline bool operator!=(REFGUID guidOne, REFGUID guidOther) {return !__InlineIsEqualGUID(guidOne,guidOther);} +#endif + +#include + +#elif defined(__GNUC__) && (defined __unix__ || defined __POSIX__) +#include +#include +typedef struct { + uint32_t Data1; + uint16_t Data2; + uint16_t Data3; + uint8_t Data4[ 8 ]; + } GUID; //same as win32 GUID + +inline bool operator==(const GUID & p_item1,const GUID & p_item2) { + return memcmp(&p_item1,&p_item2,sizeof(GUID)) == 0; +} + +inline bool operator!=(const GUID & p_item1,const GUID & p_item2) { + return memcmp(&p_item1,&p_item2,sizeof(GUID)) != 0; +} + +#else + +#error Only win32 or unix target supported. + +#endif + + + +#define PFC_MEMORY_SPACE_LIMIT ((t_uint64)1<<(sizeof(void*)*8-1)) + +#define PFC_ALLOCA_LIMIT (4096) + +#define INDEX_INVALID ((unsigned)(-1)) + + +#include +#include +#include + +#include + +#include + +#include + +#include +#include + +#define _PFC_WIDESTRING(_String) L ## _String +#define PFC_WIDESTRING(_String) _PFC_WIDESTRING(_String) + +#ifndef _DEBUG +#define PFC_ASSERT(_Expression) ((void)0) +#define PFC_ASSERT_SUCCESS(_Expression) (void)( (_Expression), 0) +#define PFC_ASSERT_NO_EXCEPTION(_Expression) { _Expression; } +#else + +#ifdef _WIN32 +namespace pfc { void myassert(const wchar_t * _Message, const wchar_t *_File, unsigned _Line); } +#define PFC_ASSERT(_Expression) (void)( (!!(_Expression)) || (pfc::myassert(PFC_WIDESTRING(#_Expression), PFC_WIDESTRING(__FILE__), __LINE__), 0) ) +#define PFC_ASSERT_SUCCESS(_Expression) PFC_ASSERT(_Expression) +#else +#define PFC_ASSERT(_Expression) assert(_Expression) +#define PFC_ASSERT_SUCCESS(_Expression) (void)( (_Expression), 0) //FIXME +#endif + +#define PFC_ASSERT_NO_EXCEPTION(_Expression) { try { _Expression; } catch(...) { PFC_ASSERT(!"Should not get here - unexpected exception"); } } +#endif + +#ifdef _MSC_VER + +#ifdef _DEBUG +#define NOVTABLE +#else +#define NOVTABLE _declspec(novtable) +#endif + +#ifdef _DEBUG +#define ASSUME(X) PFC_ASSERT(X) +#else +#define ASSUME(X) __assume(X) +#endif + +#define PFC_DEPRECATE(X) __declspec(deprecated(X)) +#define PFC_NORETURN __declspec(noreturn) +#define PFC_NOINLINE __declspec(noinline) +#else + +#define NOVTABLE +#define ASSUME(X) PFC_ASSERT(X) +#define PFC_DEPRECATE(X) +#define PFC_NORETURN +#define PFC_NOINLINE + +#endif + +#include "int_types.h" +#include "traits.h" +#include "bit_array.h" +#include "primitives.h" +#include "alloc.h" +#include "array.h" +#include "bit_array_impl.h" +#include "binary_search.h" +#include "bsearch_inline.h" +#include "bsearch.h" +#include "sort.h" +#include "order_helper.h" +#include "list.h" +#include "ptr_list.h" +#include "string.h" +#include "string_list.h" +#include "ref_counter.h" +#include "iterators.h" +#include "avltree.h" +#include "map.h" +#include "bit_array_impl_part2.h" +#include "profiler.h" +#include "guid.h" +#include "byte_order_helper.h" +#include "other.h" +#include "chain_list_v2.h" +#include "rcptr.h" +#include "com_ptr_t.h" +#include "string_conv.h" +#include "stringNew.h" +#include "pathUtils.h" +#include "instance_tracker.h" +#include "threads.h" +#include "base64.h" + +#endif //___PFC_H___ diff --git a/plugins/ListeningTo/src/players/foo_mlt/pfc/pfc_10.h b/plugins/ListeningTo/src/players/foo_mlt/pfc/pfc_10.h deleted file mode 100644 index 408fcd54d3..0000000000 --- a/plugins/ListeningTo/src/players/foo_mlt/pfc/pfc_10.h +++ /dev/null @@ -1,172 +0,0 @@ -#ifndef ___PFC_H___ -#define ___PFC_H___ - -#if !defined(_WINDOWS) && (defined(WIN32) || defined(_WIN32) || defined(WIN64) || defined(_WIN64) || defined(_WIN32_WCE)) -#define _WINDOWS -#endif - - -#define PFC_DLL_EXPORT - -#ifdef _WINDOWS - -#ifndef STRICT -#define STRICT -#endif - -#ifndef _SYS_GUID_OPERATOR_EQ_ -#define _NO_SYS_GUID_OPERATOR_EQ_ //fix retarded warning with operator== on GUID returning int -#endif - -#ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x500 -#endif - -#include - -#ifndef _SYS_GUID_OPERATOR_EQ_ -__inline bool __InlineIsEqualGUID(REFGUID rguid1, REFGUID rguid2) -{ - return ( - ((unsigned long *) &rguid1)[0] == ((unsigned long *) &rguid2)[0] && - ((unsigned long *) &rguid1)[1] == ((unsigned long *) &rguid2)[1] && - ((unsigned long *) &rguid1)[2] == ((unsigned long *) &rguid2)[2] && - ((unsigned long *) &rguid1)[3] == ((unsigned long *) &rguid2)[3]); -} - -inline bool operator==(REFGUID guidOne, REFGUID guidOther) {return __InlineIsEqualGUID(guidOne,guidOther);} -inline bool operator!=(REFGUID guidOne, REFGUID guidOther) {return !__InlineIsEqualGUID(guidOne,guidOther);} -#endif - -#include - -#elif defined(__GNUC__) && (defined __unix__ || defined __POSIX__) -#include -#include -typedef struct { - uint32_t Data1; - uint16_t Data2; - uint16_t Data3; - uint8_t Data4[ 8 ]; - } GUID; //same as win32 GUID - -inline bool operator==(const GUID & p_item1,const GUID & p_item2) { - return memcmp(&p_item1,&p_item2,sizeof(GUID)) == 0; -} - -inline bool operator!=(const GUID & p_item1,const GUID & p_item2) { - return memcmp(&p_item1,&p_item2,sizeof(GUID)) != 0; -} - -#else - -#error Only win32 or unix target supported. - -#endif - - - -#define PFC_MEMORY_SPACE_LIMIT ((t_uint64)1<<(sizeof(void*)*8-1)) - -#define PFC_ALLOCA_LIMIT (4096) - -#define INDEX_INVALID ((unsigned)(-1)) - - -#include -#include -#include - -#include - -#include - -#include - -#include -#include - -#define _PFC_WIDESTRING(_String) L ## _String -#define PFC_WIDESTRING(_String) _PFC_WIDESTRING(_String) - -#ifndef _DEBUG -#define PFC_ASSERT(_Expression) ((void)0) -#define PFC_ASSERT_SUCCESS(_Expression) (void)( (_Expression), 0) -#define PFC_ASSERT_NO_EXCEPTION(_Expression) { _Expression; } -#else - -#ifdef _WIN32 -namespace pfc { void myassert(const wchar_t * _Message, const wchar_t *_File, unsigned _Line); } -#define PFC_ASSERT(_Expression) (void)( (!!(_Expression)) || (pfc::myassert(PFC_WIDESTRING(#_Expression), PFC_WIDESTRING(__FILE__), __LINE__), 0) ) -#define PFC_ASSERT_SUCCESS(_Expression) PFC_ASSERT(_Expression) -#else -#define PFC_ASSERT(_Expression) assert(_Expression) -#define PFC_ASSERT_SUCCESS(_Expression) (void)( (_Expression), 0) //FIXME -#endif - -#define PFC_ASSERT_NO_EXCEPTION(_Expression) { try { _Expression; } catch(...) { PFC_ASSERT(!"Should not get here - unexpected exception"); } } -#endif - -#ifdef _MSC_VER - -#ifdef _DEBUG -#define NOVTABLE -#else -#define NOVTABLE _declspec(novtable) -#endif - -#ifdef _DEBUG -#define ASSUME(X) PFC_ASSERT(X) -#else -#define ASSUME(X) __assume(X) -#endif - -#define PFC_DEPRECATE(X) __declspec(deprecated(X)) -#define PFC_NORETURN __declspec(noreturn) -#define PFC_NOINLINE __declspec(noinline) -#else - -#define NOVTABLE -#define ASSUME(X) PFC_ASSERT(X) -#define PFC_DEPRECATE(X) -#define PFC_NORETURN -#define PFC_NOINLINE - -#endif - -#include "int_types.h" -#include "traits.h" -#include "bit_array.h" -#include "primitives.h" -#include "alloc.h" -#include "array.h" -#include "bit_array_impl.h" -#include "binary_search.h" -#include "bsearch_inline.h" -#include "bsearch.h" -#include "sort.h" -#include "order_helper.h" -#include "list.h" -#include "ptr_list.h" -#include "string.h" -#include "string_list.h" -#include "ref_counter.h" -#include "iterators.h" -#include "avltree.h" -#include "map.h" -#include "bit_array_impl_part2.h" -#include "profiler.h" -#include "guid.h" -#include "byte_order_helper.h" -#include "other.h" -#include "chain_list_v2.h" -#include "rcptr.h" -#include "com_ptr_t.h" -#include "string_conv.h" -#include "stringNew.h" -#include "pathUtils.h" -#include "instance_tracker.h" -#include "threads.h" -#include "base64.h" - -#endif //___PFC_H___ -- cgit v1.2.3