Mercurial > hg

changeset 17699:0696b1793f4b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pathencode: change isset name to avoid name collision On old Mac OS X versions (10.4), arpa/inet.h (included in mercurial/util.h) includes system/param.h which defines isset macro.
author André Sintzoff <andre.sintzoff@gmail.com>
date Sun, 30 Sep 2012 15:31:27 +0200
parents fa714f3ed298
children f7b3518c9cb4
files mercurial/pathencode.c
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/pathencode.c	Mon Oct 01 23:05:02 2012 -0500
+++ b/mercurial/pathencode.c	Sun Sep 30 15:31:27 2012 +0200
@@ -55,7 +55,7 @@
 	DDEFAULT,
 };
 
-static inline int isset(const uint32_t bitset[], char c)
+static inline int inset(const uint32_t bitset[], char c)
 {
 	return bitset[((uint8_t)c) >> 5] & (1 << (((uint8_t)c) & 31));
 }
@@ -419,7 +419,7 @@
 			}
 			break;
 		case DEFAULT:
-			while (isset(onebyte, src[i])) {
+			while (inset(onebyte, src[i])) {
 				charcopy(dest, &destlen, destsize, src[i++]);
 				if (i == len)
 					goto done;
@@ -439,14 +439,14 @@
 				i++;
 				break;
 			default:
-				if (isset(onebyte, src[i])) {
+				if (inset(onebyte, src[i])) {
 					do {
 						charcopy(dest, &destlen,
 							 destsize, src[i++]);
 					} while (i < len &&
-						 isset(onebyte, src[i]));
+						 inset(onebyte, src[i]));
 				}
-				else if (isset(twobytes, src[i])) {
+				else if (inset(twobytes, src[i])) {
 					char c = src[i++];
 					charcopy(dest, &destlen, destsize, '_');
 					charcopy(dest, &destlen, destsize,