summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmil Velikov <emil.l.velikov@gmail.com>2016-05-08 09:19:32 +0100
committerEmil Velikov <emil.l.velikov@gmail.com>2017-09-07 13:46:18 +0100
commit82250f26fc76d7b7574cfd472646a98e325d944a (patch)
treecd1da4ca43ffbacdf269bc08c9f3897da0309673
parentff5e59f32255913bb1cdf51441b98c9107ae165b (diff)
Kill off Strstr macro
Directly use the strstr function as opposed to wrapping it in a macro. The latter is no longer needed as of commit 72e353567f8927996a26e72848d86f692c3f0737 Author: Kaleb Keithley <kaleb@freedesktop.org> Date: Fri Nov 14 16:48:46 2003 +0000 XFree86 4.3.0.1 Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Adam Jackson <ajax@redhat.com> Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com> (IRC)
-rw-r--r--src/connect.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/connect.c b/src/connect.c
index 276a356..8b08b91 100644
--- a/src/connect.c
+++ b/src/connect.c
@@ -37,8 +37,6 @@ Author: Ralph Mor, X Consortium
static XtransConnInfo ConnectToPeer(char *networkIdsList,
char **actualConnectionRet);
-#define Strstr strstr
-
IceConn
IceOpenConnection (
char *networkIdsList,
@@ -93,7 +91,7 @@ IceOpenConnection (
for (i = 0; i < _IceConnectionCount; i++)
{
char *strptr;
- if ((strptr = (char *) Strstr (
+ if ((strptr = (char *) strstr (
networkIdsList, _IceConnectionStrings[i])) != NULL)
{
char ch = *(strptr + strlen (_IceConnectionStrings[i]));