Fossil SCM
Part 2 of [bb0118227f2c].
Commit
74bd3fd4d91dd7e78ff22357475a8de7d8cb270d371e9434c1d86566eb31cd15
Parent
bb0118227f2c837…
1 file changed
+2
+2
| --- tools/makeheaders.c | ||
| +++ tools/makeheaders.c | ||
| @@ -2229,10 +2229,11 @@ | ||
| 2229 | 2229 | while( *zArg && isspace(*zArg) && *zArg!='\n' ){ |
| 2230 | 2230 | zArg++; |
| 2231 | 2231 | } |
| 2232 | 2232 | if( *zArg==0 || *zArg=='\n' ){ return 0; } |
| 2233 | 2233 | nArg = pToken->nText + (int)(pToken->zText - zArg); |
| 2234 | + if (pToken->zText[pToken->nText-1] == '\r') { nArg--; } | |
| 2234 | 2235 | PushIfMacro("defined",zArg,nArg,pToken->nLine,0); |
| 2235 | 2236 | }else if( nCmd==6 && strncmp(zCmd,"ifndef",6)==0 ){ |
| 2236 | 2237 | /* |
| 2237 | 2238 | ** Push an #ifndef. |
| 2238 | 2239 | */ |
| @@ -2240,10 +2241,11 @@ | ||
| 2240 | 2241 | while( *zArg && isspace(*zArg) && *zArg!='\n' ){ |
| 2241 | 2242 | zArg++; |
| 2242 | 2243 | } |
| 2243 | 2244 | if( *zArg==0 || *zArg=='\n' ){ return 0; } |
| 2244 | 2245 | nArg = pToken->nText + (int)(pToken->zText - zArg); |
| 2246 | + if (pToken->zText[pToken->nText-1] == '\r') { nArg--; } | |
| 2245 | 2247 | PushIfMacro("!defined",zArg,nArg,pToken->nLine,0); |
| 2246 | 2248 | }else if( nCmd==4 && strncmp(zCmd,"else",4)==0 ){ |
| 2247 | 2249 | /* |
| 2248 | 2250 | ** Invert the #if on the top of the stack |
| 2249 | 2251 | */ |
| 2250 | 2252 |
| --- tools/makeheaders.c | |
| +++ tools/makeheaders.c | |
| @@ -2229,10 +2229,11 @@ | |
| 2229 | while( *zArg && isspace(*zArg) && *zArg!='\n' ){ |
| 2230 | zArg++; |
| 2231 | } |
| 2232 | if( *zArg==0 || *zArg=='\n' ){ return 0; } |
| 2233 | nArg = pToken->nText + (int)(pToken->zText - zArg); |
| 2234 | PushIfMacro("defined",zArg,nArg,pToken->nLine,0); |
| 2235 | }else if( nCmd==6 && strncmp(zCmd,"ifndef",6)==0 ){ |
| 2236 | /* |
| 2237 | ** Push an #ifndef. |
| 2238 | */ |
| @@ -2240,10 +2241,11 @@ | |
| 2240 | while( *zArg && isspace(*zArg) && *zArg!='\n' ){ |
| 2241 | zArg++; |
| 2242 | } |
| 2243 | if( *zArg==0 || *zArg=='\n' ){ return 0; } |
| 2244 | nArg = pToken->nText + (int)(pToken->zText - zArg); |
| 2245 | PushIfMacro("!defined",zArg,nArg,pToken->nLine,0); |
| 2246 | }else if( nCmd==4 && strncmp(zCmd,"else",4)==0 ){ |
| 2247 | /* |
| 2248 | ** Invert the #if on the top of the stack |
| 2249 | */ |
| 2250 |
| --- tools/makeheaders.c | |
| +++ tools/makeheaders.c | |
| @@ -2229,10 +2229,11 @@ | |
| 2229 | while( *zArg && isspace(*zArg) && *zArg!='\n' ){ |
| 2230 | zArg++; |
| 2231 | } |
| 2232 | if( *zArg==0 || *zArg=='\n' ){ return 0; } |
| 2233 | nArg = pToken->nText + (int)(pToken->zText - zArg); |
| 2234 | if (pToken->zText[pToken->nText-1] == '\r') { nArg--; } |
| 2235 | PushIfMacro("defined",zArg,nArg,pToken->nLine,0); |
| 2236 | }else if( nCmd==6 && strncmp(zCmd,"ifndef",6)==0 ){ |
| 2237 | /* |
| 2238 | ** Push an #ifndef. |
| 2239 | */ |
| @@ -2240,10 +2241,11 @@ | |
| 2241 | while( *zArg && isspace(*zArg) && *zArg!='\n' ){ |
| 2242 | zArg++; |
| 2243 | } |
| 2244 | if( *zArg==0 || *zArg=='\n' ){ return 0; } |
| 2245 | nArg = pToken->nText + (int)(pToken->zText - zArg); |
| 2246 | if (pToken->zText[pToken->nText-1] == '\r') { nArg--; } |
| 2247 | PushIfMacro("!defined",zArg,nArg,pToken->nLine,0); |
| 2248 | }else if( nCmd==4 && strncmp(zCmd,"else",4)==0 ){ |
| 2249 | /* |
| 2250 | ** Invert the #if on the top of the stack |
| 2251 | */ |
| 2252 |