diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-09-20 13:33:17 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-09-20 13:33:17 +0000 |
| commit | f3473a2b441ef291c123d1dbccd63afe83bab52d (patch) | |
| tree | fa03a47b9636b81823712d7b9540f44530fd5adc /dmake/expand.c | |
| parent | d453a5211a9cee5e1d19520ef3eeda52df71e37d (diff) | |
INTEGRATION: CWS os2port01 (1.5.12); FILE MERGED
2007/08/08 08:29:10 obr 1.5.12.2: RESYNC: (1.5-1.6); FILE MERGED
2006/12/28 14:54:32 ydario 1.5.12.1: OS/2 initial import.
Diffstat (limited to 'dmake/expand.c')
| -rw-r--r-- | dmake/expand.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/dmake/expand.c b/dmake/expand.c index 08f6a3736bd5..5dfcec0f5a03 100644 --- a/dmake/expand.c +++ b/dmake/expand.c @@ -1,6 +1,6 @@ /* $RCSfile: expand.c,v $ --- $Revision: 1.6 $ --- last change: $Author: vg $ $Date: 2006-09-25 09:39:30 $ +-- $Revision: 1.7 $ +-- last change: $Author: vg $ $Date: 2007-09-20 14:33:17 $ -- -- SYNOPSIS -- Macro expansion code. @@ -365,7 +365,7 @@ char *src; /* delete the extra white space, it looks ugly */ for( s = src, e = NIL(char); *s; s++ ) - if( *s == ' ' || *s == '\t' || *s == '\n' ) { + if( *s == ' ' || *s == '\t' || *s == '\n' || *s == '\r' ) { if( e == NIL(char) ) e = s; } @@ -511,6 +511,7 @@ int doexpand; case ' ': case '\t': case '\n': + case '\r': case '\0': { char *tmp; |