From d45e9c65c6c257bb361829607c0f09bb9b14fa41 Mon Sep 17 00:00:00 2001
From: Ben Pfaff <blp@nicira.com>
Date: Mon, 1 Feb 2010 09:46:31 -0800
Subject: [PATCH] ofpbuf: Rename ofpbuf "private" member for C++ header
 compatibility.

From partner.
---
 lib/ofpbuf.c |  2 +-
 lib/ofpbuf.h | 10 +++++++++-
 lib/rconn.c  |  6 +++---
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/lib/ofpbuf.c b/lib/ofpbuf.c
index d1407e76..bb216791 100644
--- a/lib/ofpbuf.c
+++ b/lib/ofpbuf.c
@@ -36,7 +36,7 @@ ofpbuf_use(struct ofpbuf *b, void *base, size_t allocated)
     b->size = 0;
     b->l2 = b->l3 = b->l4 = b->l7 = NULL;
     b->next = NULL;
-    b->private = NULL;
+    b->private_p = NULL;
 }
 
 /* Initializes 'b' as an empty ofpbuf with an initial capacity of 'size'
diff --git a/lib/ofpbuf.h b/lib/ofpbuf.h
index 06083ae3..259e703c 100644
--- a/lib/ofpbuf.h
+++ b/lib/ofpbuf.h
@@ -19,6 +19,10 @@
 
 #include <stddef.h>
 
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
 /* Buffer for holding arbitrary data.  An ofpbuf is automatically reallocated
  * as necessary if it grows too large for the available memory. */
 struct ofpbuf {
@@ -34,7 +38,7 @@ struct ofpbuf {
     void *l7;                   /* Application data. */
 
     struct ofpbuf *next;        /* Next in a list of ofpbufs. */
-    void *private;              /* Private pointer for use by owner. */
+    void *private_p;            /* Private pointer for use by owner. */
 };
 
 void ofpbuf_use(struct ofpbuf *, void *, size_t);
@@ -70,4 +74,8 @@ void ofpbuf_clear(struct ofpbuf *);
 void *ofpbuf_pull(struct ofpbuf *, size_t);
 void *ofpbuf_try_pull(struct ofpbuf *, size_t);
 
+#ifdef  __cplusplus
+}
+#endif
+
 #endif /* ofpbuf.h */
diff --git a/lib/rconn.c b/lib/rconn.c
index 2cbe43e9..35f42e44 100644
--- a/lib/rconn.c
+++ b/lib/rconn.c
@@ -547,7 +547,7 @@ rconn_send(struct rconn *rc, struct ofpbuf *b,
     if (rconn_is_connected(rc)) {
         COVERAGE_INC(rconn_queued);
         copy_to_monitor(rc, b);
-        b->private = counter;
+        b->private_p = counter;
         if (counter) {
             rconn_packet_counter_inc(counter);
         }
@@ -845,7 +845,7 @@ try_send(struct rconn *rc)
 {
     int retval = 0;
     struct ofpbuf *next = rc->txq.head->next;
-    struct rconn_packet_counter *counter = rc->txq.head->private;
+    struct rconn_packet_counter *counter = rc->txq.head->private_p;
     retval = vconn_send(rc->vconn, rc->txq.head);
     if (retval) {
         if (retval != EAGAIN) {
@@ -914,7 +914,7 @@ flush_queue(struct rconn *rc)
     }
     while (rc->txq.n > 0) {
         struct ofpbuf *b = queue_pop_head(&rc->txq);
-        struct rconn_packet_counter *counter = b->private;
+        struct rconn_packet_counter *counter = b->private_p;
         if (counter) {
             rconn_packet_counter_dec(counter);
         }
-- 
2.30.2