Switch to unified view

a/src/conf_post.h b/src/conf_post.h
...
...
24
#if defined(UPMPDCLI_NEED_PACKAGE_VERSION) && \
24
#if defined(UPMPDCLI_NEED_PACKAGE_VERSION) && \
25
    !defined(UPMPDCLI_PACKAGE_VERSION_DEFINED)
25
    !defined(UPMPDCLI_PACKAGE_VERSION_DEFINED)
26
#define UPMPDCLI_PACKAGE_VERSION_DEFINED
26
#define UPMPDCLI_PACKAGE_VERSION_DEFINED
27
static const char *UPMPDCLI_PACKAGE_VERSION = PACKAGE_VERSION;
27
static const char *UPMPDCLI_PACKAGE_VERSION = PACKAGE_VERSION;
28
#endif
28
#endif
29
30
#define UPMPDCLI_SOURCE
31
29
#undef PACKAGE_BUGREPORT
32
#undef PACKAGE_BUGREPORT
30
#undef PACKAGE_NAME
33
#undef PACKAGE_NAME
31
#undef PACKAGE_STRING
34
#undef PACKAGE_STRING
32
#undef PACKAGE_TARNAME
35
#undef PACKAGE_TARNAME
33
#undef PACKAGE_URL
36
#undef PACKAGE_URL
34
#undef PACKAGE_VERSION
37
#undef PACKAGE_VERSION
35
38
36
#ifdef __cplusplus
39
#ifdef __cplusplus
37
#ifdef  HAVE_CXX0X_UNORDERED
38
#  define UNORDERED_MAP_INCLUDE <unordered_map>
40
#define UNORDERED_MAP_INCLUDE <unordered_map>
39
#  define UNORDERED_SET_INCLUDE <unordered_set>
41
#define UNORDERED_SET_INCLUDE <unordered_set>
40
#  include <functional>
41
#  define STD_UNORDERED_MAP std::unordered_map
42
#define STD_UNORDERED_MAP std::unordered_map
42
#  define STD_UNORDERED_SET std::unordered_set
43
#define STD_UNORDERED_SET std::unordered_set
43
#  define STD_FUNCTION      std::function
44
#define STD_FUNCTION      std::function
44
#  define STD_BIND          std::bind
45
#define STD_BIND          std::bind
45
#  define STD_PLACEHOLDERS  std::placeholders
46
#define STD_PLACEHOLDERS  std::placeholders
46
#elif defined(HAVE_TR1_UNORDERED)
47
#  define UNORDERED_MAP_INCLUDE <tr1/unordered_map>
48
#  define UNORDERED_SET_INCLUDE <tr1/unordered_set>
49
#  include <tr1/functional>
50
#  define STD_UNORDERED_MAP std::tr1::unordered_map
51
#  define STD_UNORDERED_SET std::tr1::unordered_set
52
#  define STD_FUNCTION      std::tr1::function
53
#  define STD_BIND          std::tr1::bind
54
#  define STD_PLACEHOLDERS  std::tr1::placeholders
55
#else
56
#  define UNORDERED_MAP_INCLUDE <map>
57
#  define UNORDERED_SET_INCLUDE <set>
58
#  define STD_UNORDERED_MAP std::map
59
#  define STD_UNORDERED_SET std::set
60
/* Yeah we're cooked if the code uses these features */
61
#  define STD_FUNCTION 
62
#  define STD_BIND
63
#  define STD_PLACEHOLDERS
64
#endif
65
66
#ifdef HAVE_SHARED_PTR_STD
67
#  define MEMORY_INCLUDE <memory>
47
#define MEMORY_INCLUDE <memory>
68
#  define STD_SHARED_PTR    std::shared_ptr
48
#define STD_SHARED_PTR    std::shared_ptr
69
#  define STD_WEAK_PTR      std::weak_ptr
49
#define STD_WEAK_PTR      std::weak_ptr
70
#elif defined(HAVE_SHARED_PTR_TR1)
71
#  define MEMORY_INCLUDE <tr1/memory>
72
#  define STD_SHARED_PTR    std::tr1::shared_ptr
73
#  define STD_WEAK_PTR      std::tr1::weak_ptr
74
#else
75
#  define MEMORY_INCLUDE "refcntr.h"
76
#  define STD_SHARED_PTR    RefCntr
77
#endif
78
79
#endif /* c++ */
50
#endif /* c++ */