good for merge Regards -steve
On Mon, 2009-04-06 at 19:57 +0200, Jim Meyering wrote: > > From bf6c558d2bc41d0a569789b681b4f72d62ddc70b Mon Sep 17 00:00:00 2001 > From: Jim Meyering <[email protected]> > Date: Mon, 6 Apr 2009 19:56:15 +0200 > Subject: [PATCH] queue.h: Replace #ifdef COROSYNC_SOLARIS... > > * include/corosync/queue.h: Remove #ifdef COROSYNC_SOLARIS > in favor of agnostic "#ifdef queue". > --- > include/corosync/queue.h | 9 +++++---- > 1 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/include/corosync/queue.h b/include/corosync/queue.h > index 1ace7ad..064f303 100644 > --- a/include/corosync/queue.h > +++ b/include/corosync/queue.h > @@ -6,7 +6,7 @@ > * Author: Steven Dake ([email protected]) > * > * This software licensed under BSD license, the text of which follows: > - * > + * > * Redistribution and use in source and binary forms, with or without > * modification, are permitted provided that the following conditions are > met: > * > @@ -38,8 +38,9 @@ > #include <pthread.h> > #include "assert.h" > > -#ifdef COROSYNC_SOLARIS > +#ifdef queue > /* struct queue is already defined in sys/stream.h on Solaris */ > +#undef queue > #define queue _queue > #endif > struct queue { > @@ -144,7 +145,7 @@ static inline void *queue_item_get (struct queue *queue) > static inline void queue_item_remove (struct queue *queue) { > pthread_mutex_lock (&queue->mutex); > queue->tail = (queue->tail + 1) % queue->size; > - > + > assert (queue->tail != queue->head); > > queue->used--; > @@ -156,7 +157,7 @@ static inline void queue_items_remove (struct queue > *queue, int rel_count) > { > pthread_mutex_lock (&queue->mutex); > queue->tail = (queue->tail + rel_count) % queue->size; > - > + > assert (queue->tail != queue->head); > > queue->used -= rel_count; _______________________________________________ Openais mailing list [email protected] https://lists.linux-foundation.org/mailman/listinfo/openais
