Skip to content

Commit bb78fb8

Browse files
author
alexeykurzov
committed
[abseil-cpp] patch for Zephyr support
upstream PR: <abseil/abseil-cpp#2076> commit_hash:5fba58061580b647f4b1d8e2b86242f1e67cdb0e
1 parent fc763e3 commit bb78fb8

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

contrib/restricted/abseil-cpp/absl/debugging/internal/elf_mem_image.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#if defined(__ELF__) && !defined(__OpenBSD__) && !defined(__QNX__) && \
3636
!defined(__asmjs__) && !defined(__wasm__) && !defined(__HAIKU__) && \
3737
!defined(__sun) && !defined(__VXWORKS__) && !defined(__hexagon__) && \
38-
!defined(__XTENSA__) && !defined(__FREERTOS__)
38+
!defined(__XTENSA__) && !defined(__FREERTOS__) && !defined(__ZEPHYR__)
3939
#define ABSL_HAVE_ELF_MEM_IMAGE 1
4040
#endif
4141

contrib/restricted/abseil-cpp/absl/time/internal/cctz/src/time_zone_libc.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ auto tm_zone(const std::tm& tm) -> decltype(tzname[0]) {
8181
const bool is_dst = tm.tm_isdst > 0;
8282
return tzname[is_dst];
8383
}
84-
#elif defined(__FREERTOS__)
84+
#elif defined(__FREERTOS__) || defined(__ZEPHYR__)
8585
long int tm_gmtoff(const std::tm& tm) {
8686
(void)tm;
8787
return 0;

0 commit comments

Comments
 (0)