summaryrefslogtreecommitdiffstats
path: root/src/process/main.cpp
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2018-05-03 18:46:06 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2018-06-26 08:17:25 +0000
commit57c49df9c6fcbaaffc66900e191312d4e0a0edfa (patch)
treea067be82e9c367673b3f8efdbcf0a21a780b5451 /src/process/main.cpp
parent8d752cab84d437244ef0c2318b70d6516e99a044 (diff)
Adaptations for Chromium 66
Change-Id: Iee88721a50036d4ef85a23dd1708d4fb84218708 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'src/process/main.cpp')
-rw-r--r--src/process/main.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/process/main.cpp b/src/process/main.cpp
index 3b4ce9837..ef653e109 100644
--- a/src/process/main.cpp
+++ b/src/process/main.cpp
@@ -49,41 +49,41 @@ struct tm;
struct stat;
struct stat64;
-// exported in zygote_main_linux.cc
-namespace content {
+// exported in sandbox/linux/services/libc_interceptor.cc
+namespace sandbox {
struct tm* localtime_override(const time_t* timep);
struct tm* localtime64_override(const time_t* timep);
struct tm* localtime_r_override(const time_t* timep, struct tm* result);
struct tm* localtime64_r_override(const time_t* timep, struct tm* result);
}
-// from zygote_main_linux.cc
+// from sandbox/linux/services/libc_interceptor.cc
__attribute__ ((__visibility__("default")))
struct tm* localtime_proxy(const time_t* timep) __asm__ ("localtime");
struct tm* localtime_proxy(const time_t* timep)
{
- return content::localtime_override(timep);
+ return sandbox::localtime_override(timep);
}
__attribute__ ((__visibility__("default")))
struct tm* localtime64_proxy(const time_t* timep) __asm__ ("localtime64");
struct tm* localtime64_proxy(const time_t* timep)
{
- return content::localtime64_override(timep);
+ return sandbox::localtime64_override(timep);
}
__attribute__ ((__visibility__("default")))
struct tm* localtime_r_proxy(const time_t* timep, struct tm* result) __asm__ ("localtime_r");
struct tm* localtime_r_proxy(const time_t* timep, struct tm* result)
{
- return content::localtime_r_override(timep, result);
+ return sandbox::localtime_r_override(timep, result);
}
__attribute__ ((__visibility__("default")))
struct tm* localtime64_r_proxy(const time_t* timep, struct tm* result) __asm__ ("localtime64_r");
struct tm* localtime64_r_proxy(const time_t* timep, struct tm* result)
{
- return content::localtime64_r_override(timep, result);
+ return sandbox::localtime64_r_override(timep, result);
}
#endif // defined(OS_LINUX)