[Xen-changelog] [xen-unstable] blktap2: Remove gnu89-inline option from CFLAGS

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1257945104 0
# Node ID 01a941f2c9f5d7ab73436b44977695a9e4ea0060
# Parent  918f692f60688fee14f94ded3ea02c249003c69a
blktap2: Remove gnu89-inline option from CFLAGS

Not supported by older versions of gcc.

Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 tools/blktap2/drivers/Makefile        |    3 +--
 tools/blktap2/drivers/hashtable_itr.c |    7 +++++++
 tools/blktap2/drivers/hashtable_itr.h |   26 +++++---------------------
 3 files changed, 13 insertions(+), 23 deletions(-)

diff -r 918f692f6068 -r 01a941f2c9f5 tools/blktap2/drivers/Makefile
--- a/tools/blktap2/drivers/Makefile    Tue Nov 10 13:04:45 2009 +0000
+++ b/tools/blktap2/drivers/Makefile    Wed Nov 11 13:11:44 2009 +0000
@@ -49,8 +49,7 @@ REMUS-OBJS  += hashtable_itr.o
 REMUS-OBJS  += hashtable_itr.o
 REMUS-OBJS  += hashtable_utility.o
 
-$(REMUS-OBJS): CFLAGS += -fgnu89-inline -I$(XEN_XENSTORE)
-
+$(REMUS-OBJS): CFLAGS += -I$(XEN_XENSTORE)
 
 LIBAIO_DIR = $(XEN_ROOT)/tools/libaio/src
 tapdisk2 tapdisk-stream tapdisk-diff $(QCOW_UTIL): AIOLIBS := 
$(LIBAIO_DIR)/libaio.a
diff -r 918f692f6068 -r 01a941f2c9f5 tools/blktap2/drivers/hashtable_itr.c
--- a/tools/blktap2/drivers/hashtable_itr.c     Tue Nov 10 13:04:45 2009 +0000
+++ b/tools/blktap2/drivers/hashtable_itr.c     Wed Nov 11 13:11:44 2009 +0000
@@ -4,6 +4,13 @@
 #include "hashtable_private.h"
 #include "hashtable_itr.h"
 #include <stdlib.h> /* defines NULL */
+
+struct hashtable_itr {
+       struct hashtable *h;
+       struct entry *e;
+       struct entry *parent;
+       unsigned int index;
+};
 
 /*****************************************************************************/
 /* hashtable_iterator    - iterator constructor */
diff -r 918f692f6068 -r 01a941f2c9f5 tools/blktap2/drivers/hashtable_itr.h
--- a/tools/blktap2/drivers/hashtable_itr.h     Tue Nov 10 13:04:45 2009 +0000
+++ b/tools/blktap2/drivers/hashtable_itr.h     Wed Nov 11 13:11:44 2009 +0000
@@ -5,17 +5,7 @@
 #include "hashtable.h"
 #include "hashtable_private.h" /* needed to enable inlining */
 
-/*****************************************************************************/
-/* This struct is only concrete here to allow the inlining of two of the
- * accessor functions. */
-struct hashtable_itr
-{
-       struct hashtable *h;
-       struct entry *e;
-       struct entry *parent;
-       unsigned int index;
-};
-
+struct hashtable_itr;
 
 /*****************************************************************************/
 /* hashtable_iterator
@@ -28,20 +18,14 @@ hashtable_iterator(struct hashtable *h);
 /* hashtable_iterator_key
  * - return the value of the (key,value) pair at the current position */
 
-extern inline void *
-hashtable_iterator_key(struct hashtable_itr *i)
-{
-       return i->e->k;
-}
+void *
+hashtable_iterator_key(struct hashtable_itr *i);
 
 /*****************************************************************************/
 /* value - return the value of the (key,value) pair at the current position */
 
-extern inline void *
-hashtable_iterator_value(struct hashtable_itr *i)
-{
-       return i->e->v;
-}
+void *
+hashtable_iterator_value(struct hashtable_itr *i);
 
 /*****************************************************************************/
 /* advance - advance the iterator to the next element

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog