-Merge license change from AMD64 branch (r42414)

-Adjust the return value of mktime by the chosen timezone after normalizing

svn path=/trunk/; revision=42417
This commit is contained in:
Gregor Schneider 2009-08-06 11:01:44 +00:00
parent de5d448389
commit 760207bad2
41 changed files with 68 additions and 37 deletions

View file

@ -1,5 +1,5 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* COPYRIGHT: LGPL, See LGPL.txt in the top level directory
* PROJECT: ReactOS CRT library
* FILE: lib/sdk/crt/time/ftime.c
* PURPOSE: Implementation of asctime(), _asctime_s()

View file

@ -1,3 +1,10 @@
/*
* COPYRIGHT: LGPL, See LGPL.txt in the top level directory
* PROJECT: ReactOS CRT library
* FILE: lib/sdk/crt/time/bitsfixup.h
* PURPOSE: definitions for different time_t versions
* PROGRAMERS: Timo Kreuzer
*/
#if defined(_USE_EXPLITIT_32BIT_TIME) || defined(_USE_EXPLITIT_64BIT_TIME)
#undef _timeb

View file

@ -1,5 +1,5 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* COPYRIGHT: LGPL, See LGPL.txt in the top level directory
* PROJECT: ReactOS CRT library
* FILE: lib/sdk/crt/time/clock.c
* PURPOSE: Implementation of clock()

View file

@ -1,5 +1,5 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* COPYRIGHT: LGPL, See LGPL.txt in the top level directory
* PROJECT: ReactOS CRT library
* FILE: lib/sdk/crt/time/ctime.c
* PURPOSE: Implementation of ctime, _ctime_s

View file

@ -1,5 +1,5 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* COPYRIGHT: LGPL, See LGPL.txt in the top level directory
* PROJECT: ReactOS CRT library
* FILE: lib/sdk/crt/time/ctime32.c
* PURPOSE: Implementation of _ctime32()

View file

@ -1,5 +1,5 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* COPYRIGHT: LGPL, See LGPL.txt in the top level directory
* PROJECT: ReactOS CRT library
* FILE: lib/sdk/crt/time/ctime64.c
* PURPOSE: Implementation of _ctime64

View file

@ -1,5 +1,5 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* COPYRIGHT: LGPL, See LGPL.txt in the top level directory
* PROJECT: ReactOS CRT library
* FILE: lib/sdk/crt/time/difftime.c
* PURPOSE: Implementation of difftime

View file

@ -1,5 +1,5 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* COPYRIGHT: LGPL, See LGPL.txt in the top level directory
* PROJECT: ReactOS CRT library
* FILE: lib/sdk/crt/time/difftime32.c
* PURPOSE: Implementation of _difftime32

View file

@ -1,5 +1,5 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* COPYRIGHT: LGPL, See LGPL.txt in the top level directory
* PROJECT: ReactOS CRT library
* FILE: lib/sdk/crt/time/difftime64.c
* PURPOSE: Implementation of _difftime64

View file

@ -1,5 +1,5 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* COPYRIGHT: LGPL, See LGPL.txt in the top level directory
* PROJECT: ReactOS CRT library
* FILE: lib/sdk/crt/time/ftime.c
* PURPOSE: Deprecated BSD library call

View file

@ -1,5 +1,5 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* COPYRIGHT: LGPL, See LGPL.txt in the top level directory
* PROJECT: ReactOS CRT library
* FILE: lib/sdk/crt/time/ftime32.c
* PURPOSE: Implementation of _ftime32

View file

@ -1,5 +1,5 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* COPYRIGHT: LGPL, See LGPL.txt in the top level directory
* PROJECT: ReactOS CRT library
* FILE: lib/sdk/crt/time/ftime64.c
* PURPOSE: Implementation of _ftime64

View file

@ -1,5 +1,5 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* COPYRIGHT: LGPL, See LGPL.txt in the top level directory
* PROJECT: ReactOS CRT library
* FILE: lib/sdk/crt/time/futime.c
* PURPOSE: Implementation of _futime

View file

@ -1,5 +1,5 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* COPYRIGHT: LGPL, See LGPL.txt in the top level directory
* PROJECT: ReactOS CRT library
* FILE: lib/sdk/crt/time/futime32.c
* PURPOSE: Implementation of _futime32

View file

@ -1,5 +1,5 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* COPYRIGHT: LGPL, See LGPL.txt in the top level directory
* PROJECT: ReactOS CRT library
* FILE: lib/sdk/crt/time/futime64.c
* PURPOSE: Implementation of _futime64

View file

@ -1,5 +1,5 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* COPYRIGHT: LGPL, See LGPL.txt in the top level directory
* PROJECT: ReactOS CRT library
* FILE: lib/sdk/crt/time/gmtime.c
* PURPOSE: Implementation of gmtime, _gmtime32, _gmtime64

View file

@ -1,5 +1,5 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* COPYRIGHT: LGPL, See LGPL.txt in the top level directory
* PROJECT: ReactOS CRT library
* FILE: lib/sdk/crt/time/localtime.c
* PURPOSE: Implementation of localtime, localtime_s

View file

@ -1,5 +1,5 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* COPYRIGHT: LGPL, See LGPL.txt in the top level directory
* PROJECT: ReactOS CRT library
* FILE: lib/sdk/crt/time/localtime32.c
* PURPOSE: Implementation of _localtime32

View file

@ -1,5 +1,5 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* COPYRIGHT: LGPL, See LGPL.txt in the top level directory
* PROJECT: ReactOS CRT library
* FILE: lib/sdk/crt/time/localtime64.c
* PURPOSE: Implementation of _localtime64

View file

@ -1,5 +1,5 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* COPYRIGHT: LGPL, See LGPL.txt in the top level directory
* PROJECT: ReactOS CRT library
* FILE: lib/sdk/crt/time/mktime.c
* PURPOSE: Implementation of mktime, _mkgmtime
@ -83,6 +83,9 @@ mktime_worker(struct tm * ptm, int utc)
}
*ptm = *ptm2;
/* Finally adjust by the difference to GMT in seconds */
time += _timezone;
return time;
}

View file

@ -1,7 +1,7 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS CRT library
* FILE: lib/msvcrt/time/strtime.c
* FILE: lib/sdk/crt/time/strtime.c
* PURPOSE: Fills a buffer with a formatted date representation
* PROGRAMER: Ariadne
* UPDATE HISTORY:

View file

@ -1,3 +1,10 @@
/*
* COPYRIGHT: LGPL, See LGPL.txt in the top level directory
* PROJECT: ReactOS CRT library
* FILE: lib/sdk/crt/time/strftime.c
* PURPOSE:
* PROGRAMER:
*/
#include <precomp.h>
#include <tchar.h>

View file

@ -1,7 +1,7 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries
* FILE: lib/msvcrt/time/strtime.c
* FILE: lib/sdk/crt/time/strtime.c
* PURPOSE: Fills a buffer with a formatted time representation
* PROGRAMER: Ariadne
* UPDATE HISTORY:

View file

@ -1,5 +1,5 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* COPYRIGHT: LGPL, See LGPL.txt in the top level directory
* PROJECT: ReactOS system libraries
* FILE: lib/sdk/crt/time/time.c
* PURPOSE: Implementation of _time (_tim32, _tim64)

View file

@ -1,3 +1,10 @@
/*
* COPYRIGHT: LGPL, See LGPL.txt in the top level directory
* PROJECT: ReactOS CRT library
* FILE: lib/sdk/crt/time/time32.c
* PURPOSE:
* PROGRAMER:
*/
#define _USE_EXPLITIT_32BIT_TIME
#include "time.c"

View file

@ -1,3 +1,10 @@
/*
* COPYRIGHT: LGPL, See LGPL.txt in the top level directory
* PROJECT: ReactOS CRT library
* FILE: lib/sdk/crt/time/time64.c
* PURPOSE:
* PROGRAMER:
*/
#define _USE_EXPLITIT_64BIT_TIME
#include "time.c"

View file

@ -1,5 +1,5 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* COPYRIGHT: LGPL, See LGPL.txt in the top level directory
* PROJECT: ReactOS CRT library
* FILE: lib/sdk/crt/time/timezone.c
* PURPOSE: Implementation of time zone functions

View file

@ -1,5 +1,5 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* COPYRIGHT: LGPL, See LGPL.txt in the top level directory
* PROJECT: ReactOS CRT library
* FILE: lib/sdk/crt/time/ctime.c
* PURPOSE: Implementation of ctime

View file

@ -1,5 +1,5 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* COPYRIGHT: LGPL, See LGPL.txt in the top level directory
* PROJECT: ReactOS CRT library
* FILE: lib/sdk/crt/time/utime.c
* PURPOSE: Implementation of utime, _wutime

View file

@ -1,5 +1,5 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* COPYRIGHT: LGPL, See LGPL.txt in the top level directory
* PROJECT: ReactOS CRT library
* FILE: lib/sdk/crt/time/utime32.c
* PURPOSE: Implementation of _utime32

View file

@ -1,5 +1,5 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* COPYRIGHT: LGPL, See LGPL.txt in the top level directory
* PROJECT: ReactOS CRT library
* FILE: lib/sdk/crt/time/utime64.c
* PURPOSE: Implementation of _utime64

View file

@ -1,5 +1,5 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* COPYRIGHT: LGPL, See LGPL.txt in the top level directory
* PROJECT: ReactOS CRT library
* FILE: lib/sdk/crt/time/wasctime.c
* PURPOSE: Implementation of _wasctime

View file

@ -1,5 +1,5 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* COPYRIGHT: LGPL, See LGPL.txt in the top level directory
* PROJECT: ReactOS CRT library
* FILE: lib/sdk/crt/time/wcsftime.c
* PURPOSE: Implementation of _wcsftime

View file

@ -1,5 +1,5 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* COPYRIGHT: LGPL, See LGPL.txt in the top level directory
* PROJECT: ReactOS CRT library
* FILE: lib/sdk/crt/time/wctime.c
* PURPOSE: Implementation of _wctime

View file

@ -1,5 +1,5 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* COPYRIGHT: LGPL, See LGPL.txt in the top level directory
* PROJECT: ReactOS CRT library
* FILE: lib/sdk/crt/time/wctime32.c
* PURPOSE: Implementation of _wctime32

View file

@ -1,5 +1,5 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* COPYRIGHT: LGPL, See LGPL.txt in the top level directory
* PROJECT: ReactOS CRT library
* FILE: lib/sdk/crt/time/wctime64.c
* PURPOSE: Implementation of _Wctime64

View file

@ -1,7 +1,7 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS CRT library
* FILE: lib/msvcrt/time/strtime.c
* FILE: lib/sdk/crt/time/strtime.c
* PURPOSE: Fills a buffer with a formatted date representation
* PROGRAMER: Ariadne
* UPDATE HISTORY:

View file

@ -1,7 +1,7 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS CRT library
* FILE: lib/msvcrt/time/strtime.c
* FILE: lib/sdk/crt/time/strtime.c
* PURPOSE: Fills a buffer with a formatted time representation
* PROGRAMER: Ariadne
* UPDATE HISTORY:

View file

@ -1,5 +1,5 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* COPYRIGHT: LGPL, See LGPL.txt in the top level directory
* PROJECT: ReactOS CRT library
* FILE: lib/sdk/crt/time/wutime.c
* PURPOSE: Implementation of _wutime

View file

@ -1,5 +1,5 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* COPYRIGHT: LGPL, See LGPL.txt in the top level directory
* PROJECT: ReactOS CRT library
* FILE: lib/sdk/crt/time/wutime32.c
* PURPOSE: Implementation of _wutime32

View file

@ -1,5 +1,5 @@
/*
* COPYRIGHT: See COPYING in the top level directory
* COPYRIGHT: LGPL, See LGPL.txt in the top level directory
* PROJECT: ReactOS CRT library
* FILE: lib/sdk/crt/time/wutime64.c
* PURPOSE: Implementation of _wutime64