Author: tross
Date: Thu May 30 20:48:58 2013
New Revision: 1488003
URL: http://svn.apache.org/r1488003
Log:
NO-JIRA - Cleaned up include files to prevent redefining typedefs.
Added:
qpid/trunk/qpid/extras/dispatch/include/qpid/dispatch/dispatch.h (with
props)
Modified:
qpid/trunk/qpid/extras/dispatch/include/qpid/dispatch.h
qpid/trunk/qpid/extras/dispatch/include/qpid/dispatch/agent.h
qpid/trunk/qpid/extras/dispatch/include/qpid/dispatch/container.h
qpid/trunk/qpid/extras/dispatch/include/qpid/dispatch/router.h
qpid/trunk/qpid/extras/dispatch/include/qpid/dispatch/server.h
qpid/trunk/qpid/extras/dispatch/include/qpid/dispatch/timer.h
qpid/trunk/qpid/extras/dispatch/include/qpid/dispatch/user_fd.h
qpid/trunk/qpid/extras/dispatch/src/agent.c
qpid/trunk/qpid/extras/dispatch/src/container.c
qpid/trunk/qpid/extras/dispatch/src/dispatch_private.h
Modified: qpid/trunk/qpid/extras/dispatch/include/qpid/dispatch.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/extras/dispatch/include/qpid/dispatch.h?rev=1488003&r1=1488002&r2=1488003&view=diff
==============================================================================
--- qpid/trunk/qpid/extras/dispatch/include/qpid/dispatch.h (original)
+++ qpid/trunk/qpid/extras/dispatch/include/qpid/dispatch.h Thu May 30 20:48:58
2013
@@ -34,38 +34,6 @@
#include <qpid/dispatch/message.h>
#include <qpid/dispatch/container.h>
#include <qpid/dispatch/agent.h>
-
-/**
- * \defgroup General Dispatch Definitions
- * @{
- */
-
-typedef struct dx_dispatch_t dx_dispatch_t;
-
-/**
- * \brief Initialize the Dispatch library and prepare it for operation.
- *
- * @param thread_count The number of worker threads (1 or more) that the
server shall create
- * @param container_name The name of the container. If NULL, a UUID will be
generated.
- * @param router_area The name of the router's area. If NULL, a default value
will be supplied.
- * @param router_id The identifying name of the router. If NULL, it will be
set the same as the
- * container_name.
- * @return A handle to be used in API calls for this instance.
- */
-dx_dispatch_t *dx_dispatch(int thread_count, const char *container_name,
- const char *router_area, const char *router_id);
-
-
-/**
- * \brief Finalize the Dispatch library after it has stopped running.
- *
- * @param dispatch The dispatch handle returned by dx_dispatch
- */
-void dx_dispatch_free(dx_dispatch_t *dispatch);
-
-
-/**
- * @}
- */
+#include <qpid/dispatch/dispatch.h>
#endif
Modified: qpid/trunk/qpid/extras/dispatch/include/qpid/dispatch/agent.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/extras/dispatch/include/qpid/dispatch/agent.h?rev=1488003&r1=1488002&r2=1488003&view=diff
==============================================================================
--- qpid/trunk/qpid/extras/dispatch/include/qpid/dispatch/agent.h (original)
+++ qpid/trunk/qpid/extras/dispatch/include/qpid/dispatch/agent.h Thu May 30
20:48:58 2013
@@ -19,12 +19,11 @@
* under the License.
*/
+#include <qpid/dispatch/dispatch.h>
#include <stddef.h>
#include <stdbool.h>
#include <stdint.h>
-typedef struct dx_dispatch_t dx_dispatch_t;
-
/**
* \defgroup Container Management Agent
* @{
Modified: qpid/trunk/qpid/extras/dispatch/include/qpid/dispatch/container.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/extras/dispatch/include/qpid/dispatch/container.h?rev=1488003&r1=1488002&r2=1488003&view=diff
==============================================================================
--- qpid/trunk/qpid/extras/dispatch/include/qpid/dispatch/container.h (original)
+++ qpid/trunk/qpid/extras/dispatch/include/qpid/dispatch/container.h Thu May
30 20:48:58 2013
@@ -20,12 +20,11 @@
*/
#include <proton/engine.h>
+#include <qpid/dispatch/dispatch.h>
#include <qpid/dispatch/server.h>
#include <qpid/dispatch/alloc.h>
#include <qpid/dispatch/ctools.h>
-typedef struct dx_dispatch_t dx_dispatch_t;
-
typedef uint8_t dx_dist_mode_t;
#define DX_DIST_COPY 0x01
#define DX_DIST_MOVE 0x02
Added: qpid/trunk/qpid/extras/dispatch/include/qpid/dispatch/dispatch.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/extras/dispatch/include/qpid/dispatch/dispatch.h?rev=1488003&view=auto
==============================================================================
--- qpid/trunk/qpid/extras/dispatch/include/qpid/dispatch/dispatch.h (added)
+++ qpid/trunk/qpid/extras/dispatch/include/qpid/dispatch/dispatch.h Thu May 30
20:48:58 2013
@@ -0,0 +1,55 @@
+#ifndef __dispatch_dispatch_h__
+#define __dispatch_dispatch_h__ 1
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * \defgroup General Dispatch Definitions
+ * @{
+ */
+
+typedef struct dx_dispatch_t dx_dispatch_t;
+
+/**
+ * \brief Initialize the Dispatch library and prepare it for operation.
+ *
+ * @param thread_count The number of worker threads (1 or more) that the
server shall create
+ * @param container_name The name of the container. If NULL, a UUID will be
generated.
+ * @param router_area The name of the router's area. If NULL, a default value
will be supplied.
+ * @param router_id The identifying name of the router. If NULL, it will be
set the same as the
+ * container_name.
+ * @return A handle to be used in API calls for this instance.
+ */
+dx_dispatch_t *dx_dispatch(int thread_count, const char *container_name,
+ const char *router_area, const char *router_id);
+
+
+/**
+ * \brief Finalize the Dispatch library after it has stopped running.
+ *
+ * @param dispatch The dispatch handle returned by dx_dispatch
+ */
+void dx_dispatch_free(dx_dispatch_t *dispatch);
+
+
+/**
+ * @}
+ */
+
+#endif
Propchange: qpid/trunk/qpid/extras/dispatch/include/qpid/dispatch/dispatch.h
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: qpid/trunk/qpid/extras/dispatch/include/qpid/dispatch/dispatch.h
------------------------------------------------------------------------------
svn:keywords = Author Date Id Rev URL
Modified: qpid/trunk/qpid/extras/dispatch/include/qpid/dispatch/router.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/extras/dispatch/include/qpid/dispatch/router.h?rev=1488003&r1=1488002&r2=1488003&view=diff
==============================================================================
--- qpid/trunk/qpid/extras/dispatch/include/qpid/dispatch/router.h (original)
+++ qpid/trunk/qpid/extras/dispatch/include/qpid/dispatch/router.h Thu May 30
20:48:58 2013
@@ -19,11 +19,11 @@
* under the License.
*/
+#include <qpid/dispatch/dispatch.h>
+#include <qpid/dispatch/message.h>
#include <stdbool.h>
-typedef struct dx_dispatch_t dx_dispatch_t;
-typedef struct dx_message_t dx_message_t;
-typedef struct dx_address_t dx_address_t;
+typedef struct dx_address_t dx_address_t;
typedef void (*dx_router_message_cb)(void *context, dx_message_t *msg);
Modified: qpid/trunk/qpid/extras/dispatch/include/qpid/dispatch/server.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/extras/dispatch/include/qpid/dispatch/server.h?rev=1488003&r1=1488002&r2=1488003&view=diff
==============================================================================
--- qpid/trunk/qpid/extras/dispatch/include/qpid/dispatch/server.h (original)
+++ qpid/trunk/qpid/extras/dispatch/include/qpid/dispatch/server.h Thu May 30
20:48:58 2013
@@ -19,10 +19,9 @@
* under the License.
*/
+#include <qpid/dispatch/dispatch.h>
#include <proton/engine.h>
-typedef struct dx_dispatch_t dx_dispatch_t;
-
/**
* \defgroup Control Server Control Functions
* @{
Modified: qpid/trunk/qpid/extras/dispatch/include/qpid/dispatch/timer.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/extras/dispatch/include/qpid/dispatch/timer.h?rev=1488003&r1=1488002&r2=1488003&view=diff
==============================================================================
--- qpid/trunk/qpid/extras/dispatch/include/qpid/dispatch/timer.h (original)
+++ qpid/trunk/qpid/extras/dispatch/include/qpid/dispatch/timer.h Thu May 30
20:48:58 2013
@@ -19,10 +19,9 @@
* under the License.
*/
+#include <qpid/dispatch/dispatch.h>
#include <qpid/dispatch/server.h>
-typedef struct dx_dispatch_t dx_dispatch_t;
-
/**
* \defgroup Timer Server Timer Functions
* @{
Modified: qpid/trunk/qpid/extras/dispatch/include/qpid/dispatch/user_fd.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/extras/dispatch/include/qpid/dispatch/user_fd.h?rev=1488003&r1=1488002&r2=1488003&view=diff
==============================================================================
--- qpid/trunk/qpid/extras/dispatch/include/qpid/dispatch/user_fd.h (original)
+++ qpid/trunk/qpid/extras/dispatch/include/qpid/dispatch/user_fd.h Thu May 30
20:48:58 2013
@@ -19,6 +19,7 @@
* under the License.
*/
+#include <qpid/dispatch/dispatch.h>
#include <qpid/dispatch/server.h>
/**
Modified: qpid/trunk/qpid/extras/dispatch/src/agent.c
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/extras/dispatch/src/agent.c?rev=1488003&r1=1488002&r2=1488003&view=diff
==============================================================================
--- qpid/trunk/qpid/extras/dispatch/src/agent.c (original)
+++ qpid/trunk/qpid/extras/dispatch/src/agent.c Thu May 30 20:48:58 2013
@@ -32,7 +32,7 @@
#include <string.h>
#include <stdio.h>
-typedef struct dx_agent_t {
+struct dx_agent_t {
dx_server_t *server;
hash_t *class_hash;
dx_message_list_t in_fifo;
@@ -40,7 +40,7 @@ typedef struct dx_agent_t {
sys_mutex_t *lock;
dx_timer_t *timer;
dx_address_t *address;
-} dx_agent_t;
+};
struct dx_agent_class_t {
Modified: qpid/trunk/qpid/extras/dispatch/src/container.c
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/extras/dispatch/src/container.c?rev=1488003&r1=1488002&r2=1488003&view=diff
==============================================================================
--- qpid/trunk/qpid/extras/dispatch/src/container.c (original)
+++ qpid/trunk/qpid/extras/dispatch/src/container.c Thu May 30 20:48:58 2013
@@ -34,8 +34,6 @@
static char *module="CONTAINER";
-typedef struct dx_container_t dx_container_t;
-
struct dx_node_t {
dx_container_t *container;
const dx_node_type_t *ntype;
Modified: qpid/trunk/qpid/extras/dispatch/src/dispatch_private.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/extras/dispatch/src/dispatch_private.h?rev=1488003&r1=1488002&r2=1488003&view=diff
==============================================================================
--- qpid/trunk/qpid/extras/dispatch/src/dispatch_private.h (original)
+++ qpid/trunk/qpid/extras/dispatch/src/dispatch_private.h Thu May 30 20:48:58
2013
@@ -19,7 +19,8 @@
* under the License.
*/
-typedef struct dx_server_t dx_server_t;
+#include "server_private.h"
+
typedef struct dx_container_t dx_container_t;
typedef struct dx_router_t dx_router_t;
typedef struct dx_agent_t dx_agent_t;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
