[PATCH libICE 3/7] Kill off Strstr macro

Emil Velikov emil.l.velikov at gmail.com
Sun May 8 08:19:32 UTC 2016


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 at freedesktop.org>
Date:   Fri Nov 14 16:48:46 2003 +0000

    XFree86 4.3.0.1

Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
 src/connect.c | 4 +---
 1 file changed, 1 insertion(+), 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]));
-- 
2.8.0



More information about the xorg-devel mailing list