Don't use __ in defines or declarations, it's reserved

SPA_TYPE -> SPA_TYPE_INFO for type info strings
improve includes

Fixes #115
This commit is contained in:
Wim Taymans 2019-01-14 12:58:23 +01:00
parent 6856f02cab
commit 3dc6820e9e
146 changed files with 890 additions and 951 deletions

View file

@ -22,8 +22,8 @@
* DEALINGS IN THE SOFTWARE.
*/
#ifndef __SPA_POD_BUILDER_H__
#define __SPA_POD_BUILDER_H__
#ifndef SPA_POD_BUILDER_H
#define SPA_POD_BUILDER_H
#ifdef __cplusplus
extern "C" {
@ -780,4 +780,4 @@ static inline void *spa_pod_builder_object(struct spa_pod_builder *builder,
} /* extern "C" */
#endif
#endif /* __SPA_POD_BUILDER_H__ */
#endif /* SPA_POD_BUILDER_H */

View file

@ -22,8 +22,8 @@
* DEALINGS IN THE SOFTWARE.
*/
#ifndef __SPA_COMMAND_H__
#define __SPA_COMMAND_H__
#ifndef SPA_COMMAND_H
#define SPA_COMMAND_H
#ifdef __cplusplus
extern "C" {
@ -57,4 +57,4 @@ struct spa_command {
} /* extern "C" */
#endif
#endif /* __SPA_COMMAND_H__ */
#endif /* SPA_COMMAND_H */

View file

@ -22,8 +22,8 @@
* DEALINGS IN THE SOFTWARE.
*/
#ifndef __SPA_POD_COMPARE_H__
#define __SPA_POD_COMPARE_H__
#ifndef SPA_POD_COMPARE_H
#define SPA_POD_COMPARE_H
#ifdef __cplusplus
extern "C" {

View file

@ -22,8 +22,8 @@
* DEALINGS IN THE SOFTWARE.
*/
#ifndef __SPA_EVENT_H__
#define __SPA_EVENT_H__
#ifndef SPA_EVENT_H
#define SPA_EVENT_H
#ifdef __cplusplus
extern "C" {
@ -56,4 +56,4 @@ struct spa_event {
} /* extern "C" */
#endif
#endif /* __SPA_EVENT_H__ */
#endif /* SPA_EVENT_H */

View file

@ -22,8 +22,8 @@
* DEALINGS IN THE SOFTWARE.
*/
#ifndef __SPA_POD_ITER_H__
#define __SPA_POD_ITER_H__
#ifndef SPA_POD_ITER_H
#define SPA_POD_ITER_H
#ifdef __cplusplus
extern "C" {
@ -173,4 +173,4 @@ static inline int spa_pod_fixate(struct spa_pod *pod)
} /* extern "C" */
#endif
#endif /* __SPA_POD_H__ */
#endif /* SPA_POD_H */

View file

@ -22,8 +22,8 @@
* DEALINGS IN THE SOFTWARE.
*/
#ifndef __SPA_POD_PARSER_H__
#define __SPA_POD_PARSER_H__
#ifndef SPA_POD_PARSER_H
#define SPA_POD_PARSER_H
#ifdef __cplusplus
extern "C" {
@ -315,9 +315,9 @@ static inline int spa_pod_parser_get(struct spa_pod_parser *parser,
#define spa_pod_object_parse(pod,...) \
({ \
struct spa_pod_parser __p; \
spa_pod_parser_pod(&__p, pod); \
spa_pod_parser_get(&__p, "{", ##__VA_ARGS__, NULL); \
struct spa_pod_parser _p; \
spa_pod_parser_pod(&_p, pod); \
spa_pod_parser_get(&_p, "{", ##__VA_ARGS__, NULL); \
})
static inline int spa_pod_is_bool(struct spa_pod *pod)
@ -431,4 +431,4 @@ static inline int spa_pod_get_fraction(struct spa_pod *pod, struct spa_fraction
} /* extern "C" */
#endif
#endif /* __SPA_POD_PARSER_H__ */
#endif /* SPA_POD_PARSER_H */

View file

@ -22,8 +22,8 @@
* DEALINGS IN THE SOFTWARE.
*/
#ifndef __SPA_POD_H__
#define __SPA_POD_H__
#ifndef SPA_POD_H
#define SPA_POD_H
#ifdef __cplusplus
extern "C" {
@ -58,19 +58,19 @@ struct spa_pod {
struct spa_pod_bool {
struct spa_pod pod;
int32_t value;
int32_t __padding;
int32_t _padding;
};
struct spa_pod_id {
struct spa_pod pod;
uint32_t value;
int32_t __padding;
int32_t _padding;
};
struct spa_pod_int {
struct spa_pod pod;
int32_t value;
int32_t __padding;
int32_t _padding;
};
struct spa_pod_long {
@ -81,7 +81,7 @@ struct spa_pod_long {
struct spa_pod_float {
struct spa_pod pod;
float value;
int32_t __padding;
int32_t _padding;
};
struct spa_pod_double {
@ -256,4 +256,4 @@ struct spa_pod_sequence {
} /* extern "C" */
#endif
#endif /* __SPA_POD_H__ */
#endif /* SPA_POD_H */