Author: kgiusti
Date: Thu Oct 25 13:11:29 2012
New Revision: 1402141
URL: http://svn.apache.org/viewvc?rev=1402141&view=rev
Log:
NO-JIRA: fix macro name collision
Modified:
qpid/proton/trunk/proton-c/src/driver.c
Modified: qpid/proton/trunk/proton-c/src/driver.c
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/driver.c?rev=1402141&r1=1402140&r2=1402141&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/driver.c (original)
+++ qpid/proton/trunk/proton-c/src/driver.c Thu Oct 25 13:11:29 2012
@@ -72,13 +72,13 @@ struct pn_listener_t {
};
#define IO_BUF_SIZE (4*1024)
-#define NAME_MAX (256)
+#define PN_NAME_MAX (256)
struct pn_connector_t {
pn_driver_t *driver;
pn_connector_t *connector_next;
pn_connector_t *connector_prev;
- char name[256];
+ char name[PN_NAME_MAX];
int idx;
bool pending_tick;
bool pending_read;
@@ -251,7 +251,7 @@ pn_connector_t *pn_listener_accept(pn_li
if (l->driver->trace & (PN_TRACE_FRM | PN_TRACE_RAW | PN_TRACE_DRV))
fprintf(stderr, "Accepted from %s:%s\n", host, serv);
pn_connector_t *c = pn_connector_fd(l->driver, sock, NULL);
- snprintf(c->name, NAME_MAX, "%s:%s", host, serv);
+ snprintf(c->name, PN_NAME_MAX, "%s:%s", host, serv);
c->listener = l;
return c;
}
@@ -328,7 +328,7 @@ pn_connector_t *pn_connector(pn_driver_t
freeaddrinfo(addr);
pn_connector_t *c = pn_connector_fd(driver, sock, context);
- snprintf(c->name, NAME_MAX, "%s:%s", host, port);
+ snprintf(c->name, PN_NAME_MAX, "%s:%s", host, port);
if (driver->trace & (PN_TRACE_FRM | PN_TRACE_RAW | PN_TRACE_DRV))
fprintf(stderr, "Connected to %s\n", c->name);
return c;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
