WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-changelog

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

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] [xen-unstable] blktap2: Remove gnu89-inline option from CFLAGS
From: Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>
Date: Wed, 11 Nov 2009 05:15:11 -0800
Delivery-date: Wed, 11 Nov 2009 05:15:12 -0800
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: xen-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-changelog-bounces@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

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] [xen-unstable] blktap2: Remove gnu89-inline option from CFLAGS, Xen patchbot-unstable <=