This is an automated email from the ASF dual-hosted git repository.

gmurthy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git


The following commit(s) were added to refs/heads/master by this push:
     new fdf170a  DISPATCH-1560: Fix fedora rawhide compilation issues. This 
closes #677.
fdf170a is described below

commit fdf170a9a0c225856f1aebc10d47935eadd575e0
Author: Ganesh Murthy <[email protected]>
AuthorDate: Wed Feb 5 04:21:51 2020 -0500

    DISPATCH-1560: Fix fedora rawhide compilation issues. This closes #677.
---
 include/qpid/dispatch/amqp.h              | 2 +-
 src/connection_manager.c                  | 2 +-
 src/router_core/agent_address.h           | 2 +-
 src/router_core/agent_config_address.h    | 2 +-
 src/router_core/agent_config_auto_link.h  | 2 +-
 src/router_core/agent_config_link_route.h | 2 +-
 src/router_core/agent_connection.h        | 2 +-
 src/router_core/agent_link.h              | 2 +-
 src/router_core/agent_router.h            | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/include/qpid/dispatch/amqp.h b/include/qpid/dispatch/amqp.h
index e49d20a..5c3de51 100644
--- a/include/qpid/dispatch/amqp.h
+++ b/include/qpid/dispatch/amqp.h
@@ -62,7 +62,7 @@ typedef enum {
 /**
  * AMQP Type Tags
  */
-enum {
+typedef enum {
     QD_AMQP_NULL = 0x40,
     QD_AMQP_BOOLEAN = 0x56,
     QD_AMQP_TRUE = 0x41,
diff --git a/src/connection_manager.c b/src/connection_manager.c
index 882131c..fbeebca 100644
--- a/src/connection_manager.c
+++ b/src/connection_manager.c
@@ -786,7 +786,7 @@ qd_error_t qd_entity_refresh_connector(qd_entity_t* entity, 
void *impl)
     int arr_length = get_failover_info_length(conn_info_list);
 
     // This is the string that will contain the comma separated failover list
-    char failover_info[arr_length];
+    char failover_info[arr_length + 1];
     failover_info[0] = 0;
 
     while(item) {
diff --git a/src/router_core/agent_address.h b/src/router_core/agent_address.h
index 55a4cb5..e25ba6a 100644
--- a/src/router_core/agent_address.h
+++ b/src/router_core/agent_address.h
@@ -33,6 +33,6 @@ void qdra_address_get_CT(qdr_core_t *core,
 
 #define QDR_ADDRESS_COLUMN_COUNT 21
 
-const char *qdr_address_columns[QDR_ADDRESS_COLUMN_COUNT + 1];
+extern const char *qdr_address_columns[QDR_ADDRESS_COLUMN_COUNT + 1];
 
 #endif
diff --git a/src/router_core/agent_config_address.h 
b/src/router_core/agent_config_address.h
index 06d56f9..30f8d8c 100644
--- a/src/router_core/agent_config_address.h
+++ b/src/router_core/agent_config_address.h
@@ -37,6 +37,6 @@ char 
*qdra_config_address_validate_pattern_CT(qd_parsed_field_t *pattern_field,
                                               const char **error);
 #define QDR_CONFIG_ADDRESS_COLUMN_COUNT 11
 
-const char *qdr_config_address_columns[QDR_CONFIG_ADDRESS_COLUMN_COUNT + 1];
+extern const char *qdr_config_address_columns[QDR_CONFIG_ADDRESS_COLUMN_COUNT 
+ 1];
 
 #endif
diff --git a/src/router_core/agent_config_auto_link.h 
b/src/router_core/agent_config_auto_link.h
index 56327cf..35f026f 100644
--- a/src/router_core/agent_config_auto_link.h
+++ b/src/router_core/agent_config_auto_link.h
@@ -34,6 +34,6 @@ void qdra_config_auto_link_get_CT(qdr_core_t    *core,
                                   const char    
*qdr_config_auto_link_columns[]);
 #define QDR_CONFIG_AUTO_LINK_COLUMN_COUNT 16
 
-const char *qdr_config_auto_link_columns[QDR_CONFIG_AUTO_LINK_COLUMN_COUNT + 
1];
+extern const char 
*qdr_config_auto_link_columns[QDR_CONFIG_AUTO_LINK_COLUMN_COUNT + 1];
 
 #endif
diff --git a/src/router_core/agent_config_link_route.h 
b/src/router_core/agent_config_link_route.h
index b3b6a61..c911ff7 100644
--- a/src/router_core/agent_config_link_route.h
+++ b/src/router_core/agent_config_link_route.h
@@ -36,6 +36,6 @@ const char *qdra_link_route_direction_CT(qd_parsed_field_t 
*field, qd_direction_
 
 #define QDR_CONFIG_LINK_ROUTE_COLUMN_COUNT 13
 
-const char *qdr_config_link_route_columns[QDR_CONFIG_LINK_ROUTE_COLUMN_COUNT + 
1];
+extern const char 
*qdr_config_link_route_columns[QDR_CONFIG_LINK_ROUTE_COLUMN_COUNT + 1];
 
 #endif
diff --git a/src/router_core/agent_connection.h 
b/src/router_core/agent_connection.h
index 247aaf5..9410c3e 100644
--- a/src/router_core/agent_connection.h
+++ b/src/router_core/agent_connection.h
@@ -36,6 +36,6 @@ void qdra_connection_update_CT(qdr_core_t      *core,
                              qd_parsed_field_t *in_body);
 
 #define QDR_CONNECTION_COLUMN_COUNT 23
-const char *qdr_connection_columns[QDR_CONNECTION_COLUMN_COUNT + 1];
+extern const char *qdr_connection_columns[QDR_CONNECTION_COLUMN_COUNT + 1];
 
 #endif
diff --git a/src/router_core/agent_link.h b/src/router_core/agent_link.h
index 7c50312..06e503d 100644
--- a/src/router_core/agent_link.h
+++ b/src/router_core/agent_link.h
@@ -31,6 +31,6 @@ void qdra_link_update_CT(qdr_core_t          *core,
 
 #define QDR_LINK_COLUMN_COUNT  29
 
-const char *qdr_link_columns[QDR_LINK_COLUMN_COUNT + 1];
+extern const char *qdr_link_columns[QDR_LINK_COLUMN_COUNT + 1];
 
 #endif
diff --git a/src/router_core/agent_router.h b/src/router_core/agent_router.h
index 5246187..21027b8 100644
--- a/src/router_core/agent_router.h
+++ b/src/router_core/agent_router.h
@@ -23,7 +23,7 @@
 
 #define QDR_ROUTER_COLUMN_COUNT  31
 
-const char *qdr_router_columns[QDR_ROUTER_COLUMN_COUNT + 1];
+extern const char *qdr_router_columns[QDR_ROUTER_COLUMN_COUNT + 1];
 
 void qdra_router_get_first_CT(qdr_core_t *core, qdr_query_t *query, int 
offset);
 void qdra_router_get_next_CT(qdr_core_t *core, qdr_query_t *query);


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

Reply via email to