Remove ftime from bionic LP64
Bug: 13935372 Change-Id: I5dd31147143b23a090a3b75b846dc5354e599121
This commit is contained in:
Dan Albert
parent
623dce3bd4
commit
26d6799bbe
@ -43,7 +43,6 @@ libc_common_src_files := \
|
|||||||
bionic/err.c \
|
bionic/err.c \
|
||||||
bionic/ether_aton.c \
|
bionic/ether_aton.c \
|
||||||
bionic/ether_ntoa.c \
|
bionic/ether_ntoa.c \
|
||||||
bionic/ftime.c \
|
|
||||||
bionic/fts.c \
|
bionic/fts.c \
|
||||||
bionic/getdtablesize.c \
|
bionic/getdtablesize.c \
|
||||||
bionic/gethostname.c \
|
bionic/gethostname.c \
|
||||||
|
|||||||
@ -1,49 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2008 The Android Open Source Project
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions
|
|
||||||
* are met:
|
|
||||||
* * Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* * Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in
|
|
||||||
* the documentation and/or other materials provided with the
|
|
||||||
* distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
||||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
||||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
|
||||||
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
|
||||||
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
||||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
|
||||||
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
|
|
||||||
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
|
|
||||||
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
|
||||||
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
|
|
||||||
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
||||||
* SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
#include <sys/timeb.h>
|
|
||||||
|
|
||||||
int ftime(struct timeb *tb)
|
|
||||||
{
|
|
||||||
struct timeval tv;
|
|
||||||
struct timezone tz;
|
|
||||||
|
|
||||||
if (gettimeofday (&tv, &tz) < 0)
|
|
||||||
return -1;
|
|
||||||
|
|
||||||
tb->time = tv.tv_sec;
|
|
||||||
tb->millitm = (tv.tv_usec + 500) / 1000;
|
|
||||||
|
|
||||||
if (tb->millitm == 1000) {
|
|
||||||
++tb->time;
|
|
||||||
tb->millitm = 0;
|
|
||||||
}
|
|
||||||
tb->timezone = tz.tz_minuteswest;
|
|
||||||
tb->dstflag = tz.tz_dsttime;
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
@ -226,4 +226,35 @@ extern "C" wchar_t* wcswcs(wchar_t* haystack, wchar_t* needle) {
|
|||||||
return wcsstr(haystack, needle);
|
return wcsstr(haystack, needle);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Only used by ftime, which was removed from POSIX.
|
||||||
|
struct timeb {
|
||||||
|
time_t time;
|
||||||
|
unsigned short millitm;
|
||||||
|
short timezone;
|
||||||
|
short dstflag;
|
||||||
|
};
|
||||||
|
|
||||||
|
// This was removed from POSIX.
|
||||||
|
extern "C" int ftime(struct timeb* tb)
|
||||||
|
{
|
||||||
|
struct timeval tv;
|
||||||
|
struct timezone tz;
|
||||||
|
|
||||||
|
if (gettimeofday(&tv, &tz) < 0)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
tb->time = tv.tv_sec;
|
||||||
|
tb->millitm = (tv.tv_usec + 500) / 1000;
|
||||||
|
|
||||||
|
if (tb->millitm == 1000) {
|
||||||
|
++tb->time;
|
||||||
|
tb->millitm = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
tb->timezone = tz.tz_minuteswest;
|
||||||
|
tb->dstflag = tz.tz_dsttime;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@ -1,47 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2008 The Android Open Source Project
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions
|
|
||||||
* are met:
|
|
||||||
* * Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* * Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in
|
|
||||||
* the documentation and/or other materials provided with the
|
|
||||||
* distribution.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
||||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
||||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
|
||||||
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
|
||||||
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
||||||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
|
||||||
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
|
|
||||||
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
|
|
||||||
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
|
||||||
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
|
|
||||||
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
||||||
* SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
#ifndef _SYS_TIMEB_H
|
|
||||||
#define _SYS_TIMEB_H
|
|
||||||
|
|
||||||
#include <sys/cdefs.h>
|
|
||||||
#include <sys/time.h>
|
|
||||||
|
|
||||||
__BEGIN_DECLS
|
|
||||||
|
|
||||||
struct timeb {
|
|
||||||
time_t time;
|
|
||||||
unsigned short millitm;
|
|
||||||
short timezone;
|
|
||||||
short dstflag;
|
|
||||||
};
|
|
||||||
|
|
||||||
extern int ftime(struct timeb* timebuf);
|
|
||||||
|
|
||||||
__END_DECLS
|
|
||||||
|
|
||||||
#endif /* _SYS_TIMEB_H */
|
|
||||||
Loading…
x
Reference in New Issue
Block a user