summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2003-01-06 23:14:07 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2003-01-06 23:14:07 +0000
commit51d92d3f2e35d8b37d40f37d77604cd770ec911d (patch)
treecc5244fd274ad471246ed1404ceb919a5a5b0c2b
parent1615261a2f5377be37d39943fb8b8989d17eb1c1 (diff)
whitespace shredder
Original commit message from CVS: whitespace shredder
-rw-r--r--gst/gstmacros.h4
-rw-r--r--gst/gsttrashstack.h22
2 files changed, 13 insertions, 13 deletions
diff --git a/gst/gstmacros.h b/gst/gstmacros.h
index d8037dd34..8f3ff018d 100644
--- a/gst/gstmacros.h
+++ b/gst/gstmacros.h
@@ -22,7 +22,7 @@
#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
# define GST_GNUC_CONSTRUCTOR \
- __attribute__ ((constructor))
+ __attribute__ ((constructor))
#else /* !__GNUC__ */
# define GST_GNUC_CONSTRUCTOR
#endif /* !__GNUC__ */
@@ -31,7 +31,7 @@
# define GST_INLINE_FUNC extern __inline__
# define GST_CAN_INLINE 1
#else
-# define GST_INLINE_FUNC extern
+# define GST_INLINE_FUNC extern
# undef GST_CAN_INLINE
#endif
diff --git a/gst/gsttrashstack.h b/gst/gsttrashstack.h
index b814dfcca..d348169fe 100644
--- a/gst/gsttrashstack.h
+++ b/gst/gsttrashstack.h
@@ -33,22 +33,22 @@ struct _GstTrashStackElement {
};
struct _GstTrashStack {
- volatile gpointer head;
- volatile gulong count; /* for the ABA problem */
+ volatile gpointer head;
+ volatile gulong count; /* for the ABA problem */
GMutex *lock; /* lock for C fallback */
};
-GST_INLINE_FUNC GstTrashStack* gst_trash_stack_new (void);
-GST_INLINE_FUNC void gst_trash_stack_init (GstTrashStack *stack);
-GST_INLINE_FUNC void gst_trash_stack_destroy (GstTrashStack *stack);
-GST_INLINE_FUNC void gst_trash_stack_free (GstTrashStack *stack);
+GST_INLINE_FUNC GstTrashStack* gst_trash_stack_new (void);
+GST_INLINE_FUNC void gst_trash_stack_init (GstTrashStack *stack);
+GST_INLINE_FUNC void gst_trash_stack_destroy (GstTrashStack *stack);
+GST_INLINE_FUNC void gst_trash_stack_free (GstTrashStack *stack);
-GST_INLINE_FUNC void gst_trash_stack_push (GstTrashStack *stack, gpointer mem);
-GST_INLINE_FUNC gpointer gst_trash_stack_pop (GstTrashStack *stack);
+GST_INLINE_FUNC void gst_trash_stack_push (GstTrashStack *stack, gpointer mem);
+GST_INLINE_FUNC gpointer gst_trash_stack_pop (GstTrashStack *stack);
#if defined (GST_CAN_INLINE) || defined (__GST_TRASH_STACK_C__)
-#if defined (__i386__) && defined (__GNUC__) && __GNUC__ >= 2
+#if defined (__i386__) && defined (__GNUC__) && __GNUC__ >= 2
#ifdef GST_CONFIG_NO_SMP
#define SMP_LOCK ""
@@ -118,7 +118,7 @@ gst_trash_stack_pop (GstTrashStack *stack)
return head;
}
-#else
+#else /* ie not: defined (__i386__) && defined (__GNUC__) && __GNUC__ >= 2 */
/*
* generic implementation
@@ -151,7 +151,7 @@ GST_INLINE_FUNC gpointer
gst_trash_stack_pop (GstTrashStack *stack)
{
GstTrashStackElement *head;
-
+
g_mutex_lock (stack->lock);
head = (GstTrashStackElement *) stack->head;
if (head)