diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2013-01-04 19:52:59 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2013-01-08 17:03:41 -0800 |
| commit | 97034e393cfa63a55e9cec2d795ac41e5872f5b5 (patch) | |
| tree | d88d6e536e29055b7c4c9d041196d88abedb44b0 /src/TMparse.c | |
| parent | 0033d063894d003b1cb6edb14107d6ef7e0f3fec (diff) | |
unifdef -U__UNIXOS2__
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'src/TMparse.c')
| -rw-r--r-- | src/TMparse.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/TMparse.c b/src/TMparse.c index 5594cad..83b39d5 100644 --- a/src/TMparse.c +++ b/src/TMparse.c @@ -380,11 +380,7 @@ static EventKey events[] = { }; -#ifndef __UNIXOS2__ #define IsNewline(str) ((str) == '\n') -#else -#define IsNewline(str) ((str) == '\n' || (str) == '\r') -#endif #define ScanFor(str, ch) \ while ((*(str) != (ch)) && (*(str) != '\0') && !IsNewline(*(str))) (str)++ @@ -396,13 +392,8 @@ static EventKey events[] = { ('a' <= *(str) && *(str) <= 'z') || \ ('0' <= *(str) && *(str) <= '9')) (str)++ -#ifndef __UNIXOS2__ #define ScanWhitespace(str) \ while (*(str) == ' ' || *(str) == '\t') (str)++ -#else -#define ScanWhitespace(str) \ - while (*(str) == ' ' || *(str) == '\t' || *(str) == '\r') (str)++ -#endif static Boolean initialized = FALSE; static XrmQuark QMeta; @@ -1811,11 +1802,7 @@ static void ShowProduction( size_t len; char *eol, *production, productionbuf[500]; -#ifdef __UNIXOS2__ - eol = strchr(currentProduction, '\r'); - if (!eol) /* try '\n' as well below */ -#endif - eol = strchr(currentProduction, '\n'); + eol = strchr(currentProduction, '\n'); if (eol) len = eol - currentProduction; else len = strlen (currentProduction); production = XtStackAlloc (len + 1, productionbuf); |