Fossil SCM
mkheaders carriage-return fix from [forum:6b2e7dbee7 | forum post 6b2e7dbee7].
Commit
bb0118227f2c83721f05f5731d0122f4d2b4a08daf4fc1fb50d7f47f6cf590b7
Parent
b05a07a9a201ccf…
1 file changed
+1
+1
| --- tools/makeheaders.c | ||
| +++ tools/makeheaders.c | ||
| @@ -2207,10 +2207,11 @@ | ||
| 2207 | 2207 | while( *zArg && isspace(*zArg) && *zArg!='\n' ){ |
| 2208 | 2208 | zArg++; |
| 2209 | 2209 | } |
| 2210 | 2210 | if( *zArg==0 || *zArg=='\n' ){ return 0; } |
| 2211 | 2211 | nArg = pToken->nText + (int)(pToken->zText - zArg); |
| 2212 | + if (pToken->zText[pToken->nText-1] == '\r') { nArg--; } | |
| 2212 | 2213 | if( nArg==9 && strncmp(zArg,"INTERFACE",9)==0 ){ |
| 2213 | 2214 | PushIfMacro(0,0,0,pToken->nLine,PS_Interface); |
| 2214 | 2215 | }else if( nArg==16 && strncmp(zArg,"EXPORT_INTERFACE",16)==0 ){ |
| 2215 | 2216 | PushIfMacro(0,0,0,pToken->nLine,PS_Export); |
| 2216 | 2217 | }else if( nArg==15 && strncmp(zArg,"LOCAL_INTERFACE",15)==0 ){ |
| 2217 | 2218 |
| --- tools/makeheaders.c | |
| +++ tools/makeheaders.c | |
| @@ -2207,10 +2207,11 @@ | |
| 2207 | while( *zArg && isspace(*zArg) && *zArg!='\n' ){ |
| 2208 | zArg++; |
| 2209 | } |
| 2210 | if( *zArg==0 || *zArg=='\n' ){ return 0; } |
| 2211 | nArg = pToken->nText + (int)(pToken->zText - zArg); |
| 2212 | if( nArg==9 && strncmp(zArg,"INTERFACE",9)==0 ){ |
| 2213 | PushIfMacro(0,0,0,pToken->nLine,PS_Interface); |
| 2214 | }else if( nArg==16 && strncmp(zArg,"EXPORT_INTERFACE",16)==0 ){ |
| 2215 | PushIfMacro(0,0,0,pToken->nLine,PS_Export); |
| 2216 | }else if( nArg==15 && strncmp(zArg,"LOCAL_INTERFACE",15)==0 ){ |
| 2217 |
| --- tools/makeheaders.c | |
| +++ tools/makeheaders.c | |
| @@ -2207,10 +2207,11 @@ | |
| 2207 | while( *zArg && isspace(*zArg) && *zArg!='\n' ){ |
| 2208 | zArg++; |
| 2209 | } |
| 2210 | if( *zArg==0 || *zArg=='\n' ){ return 0; } |
| 2211 | nArg = pToken->nText + (int)(pToken->zText - zArg); |
| 2212 | if (pToken->zText[pToken->nText-1] == '\r') { nArg--; } |
| 2213 | if( nArg==9 && strncmp(zArg,"INTERFACE",9)==0 ){ |
| 2214 | PushIfMacro(0,0,0,pToken->nLine,PS_Interface); |
| 2215 | }else if( nArg==16 && strncmp(zArg,"EXPORT_INTERFACE",16)==0 ){ |
| 2216 | PushIfMacro(0,0,0,pToken->nLine,PS_Export); |
| 2217 | }else if( nArg==15 && strncmp(zArg,"LOCAL_INTERFACE",15)==0 ){ |
| 2218 |