Repository: qpid-dispatch
Updated Branches:
  refs/heads/master fa13d281d -> 9f5a3873e


NO-JIRA: Fix typedef redefinition compile errors on some compilers


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/9f5a3873
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/9f5a3873
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/9f5a3873

Branch: refs/heads/master
Commit: 9f5a3873ee86eeb94289db3c72e8c4bfef20c43f
Parents: fa13d28
Author: Alan Conway <[email protected]>
Authored: Thu Jan 5 10:30:36 2017 -0500
Committer: Alan Conway <[email protected]>
Committed: Thu Jan 5 10:30:36 2017 -0500

----------------------------------------------------------------------
 include/qpid/dispatch/router_core.h | 1 -
 src/http-none.c                     | 2 +-
 src/http.h                          | 3 ++-
 3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/9f5a3873/include/qpid/dispatch/router_core.h
----------------------------------------------------------------------
diff --git a/include/qpid/dispatch/router_core.h 
b/include/qpid/dispatch/router_core.h
index 63088ae..6478010 100644
--- a/include/qpid/dispatch/router_core.h
+++ b/include/qpid/dispatch/router_core.h
@@ -32,7 +32,6 @@
  * exclusive access to that connection.
  */
 
-typedef struct qdr_core_t            qdr_core_t;
 typedef struct qdr_subscription_t    qdr_subscription_t;
 typedef struct qdr_connection_t      qdr_connection_t;
 typedef struct qdr_link_t            qdr_link_t;

http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/9f5a3873/src/http-none.c
----------------------------------------------------------------------
diff --git a/src/http-none.c b/src/http-none.c
index ae27f4c..b9af9e1 100644
--- a/src/http-none.c
+++ b/src/http-none.c
@@ -23,7 +23,7 @@
 
 /* No HTTP implementation available. */
 
-qd_http_server_t *qd_http_server(qd_dispatch_t *d, qd_log_source_t *log)
+qd_http_server_t *qd_http_server(struct qd_dispatch_t *d, qd_log_source_t *log)
 {
     qd_log(log, QD_LOG_WARNING, "HTTP support is not available");
     return 0;

http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/9f5a3873/src/http.h
----------------------------------------------------------------------
diff --git a/src/http.h b/src/http.h
index 98d288a..fae3f1d 100644
--- a/src/http.h
+++ b/src/http.h
@@ -22,7 +22,8 @@
 
 typedef struct qd_http_listener_t qd_http_listener_t;
 typedef struct qd_http_server_t qd_http_server_t;
-typedef struct qd_dispatch_t qd_dispatch_t;
+
+struct qd_dispatch_t;
 struct qd_log_source_t;
 struct qd_server_config_t;
 struct qdpn_connector_t;


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to