diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-09-25 12:35:06 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-09-25 12:35:06 +0000 |
| commit | fafef036f5d5749b27e93a56d66cc9d136fdaae5 (patch) | |
| tree | b4e03956bc53afa066ecd881da4022acd1da9834 /rsc/source/rscpp | |
| parent | 83d8c263ca2bf8c8751d8d58a263722db8b88424 (diff) | |
INTEGRATION: CWS obo05 (1.13.2); FILE MERGED
2006/08/16 06:53:05 obo 1.13.2.2: #i53611# use 32 bit time_t
2006/07/03 16:02:27 obo 1.13.2.1: #i53611# type conversion
Diffstat (limited to 'rsc/source/rscpp')
| -rw-r--r-- | rsc/source/rscpp/cpp3.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/rsc/source/rscpp/cpp3.c b/rsc/source/rscpp/cpp3.c index 0a61bd8e1867..0faa76d4958f 100644 --- a/rsc/source/rscpp/cpp3.c +++ b/rsc/source/rscpp/cpp3.c @@ -4,9 +4,9 @@ * * $RCSfile: cpp3.c,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: ihi $ $Date: 2006-08-24 10:45:16 $ + * last change: $Author: vg $ $Date: 2006-09-25 13:35:06 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -32,6 +32,9 @@ * MA 02111-1307 USA * ************************************************************************/ +#if defined(_MSC_VER) && (_MSC_VER > 1310) +#define _USE_32BIT_TIME_T +#endif #include <stdio.h> #ifdef UNX @@ -509,13 +512,9 @@ void initdefines() dp = defendel("__DATE__", FALSE); dp->repl = tp = getmem(27); dp->nargs = DEF_NOARGS; -#ifdef MAC /* MA */ - time( (time_t*)&tvec); -#else - time(&tvec); -#endif + time( (time_t*)&tvec); *tp++ = '"'; - strcpy(tp, ctime(&tvec)); + strcpy(tp, ctime((const time_t*)&tvec)); tp[24] = '"'; /* Overwrite newline */ #endif } @@ -608,4 +607,3 @@ char **argv; return (j); /* Return new argc */ } #endif - |