admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

mruby-io, hal-posix-io: fix amalgamation compatibility

Browse Source 
Remove unused mrb_stat typedef from file.c that conflicted with the
mrb_stat() function in file_test.c when compiled as a single
translation unit.

Fix convert_stat() in hal-posix-io to handle st_atime macro correctly
in both normal and amalgamated builds by extracting time values before
undefining the macros.

Co-authored-by: Claude <noreply@anthropic.com>
This commit is contained in:
Yukihiro "Matz" Matsumoto
2026-01-01 09:01:15 +09:00
parent 510ebd738d
commit c7463af767
2 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/hal-posix-io/src/io_hal.c
+28 -12
View File
@@ -41,10 +41,31 @@
static void
convert_stat(const struct stat *src, mrb_io_stat *dst)
{
/* Save time values to avoid macro expansion issues */
time_t atime = src->st_atime;
time_t mtime = src->st_mtime;
time_t ctime = src->st_ctime;
/* Extract time values FIRST while macros are still defined.
* On POSIX systems, st_atime may be a macro for st_atim.tv_sec */
time_t atime_val, mtime_val, ctime_val;
#if defined(st_atime)
/* st_atime is a macro - use it to extract from src */
atime_val = src->st_atime;
mtime_val = src->st_mtime;
ctime_val = src->st_ctime;
#elif defined(__APPLE__) || defined(__FreeBSD__) || \
defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
/* BSD/macOS: st_atime is typically a direct member */
atime_val = src->st_atime;
mtime_val = src->st_mtime;
ctime_val = src->st_ctime;
#else
/* POSIX.1-2008: use st_atim.tv_sec directly */
atime_val = src->st_atim.tv_sec;
mtime_val = src->st_mtim.tv_sec;
ctime_val = src->st_ctim.tv_sec;
#endif
/* Undefine macros to avoid interference with mrb_io_stat fields */
#undef st_atime
#undef st_mtime
#undef st_ctime
dst->st_dev = (uint64_t)src->st_dev;
dst->st_ino = (uint64_t)src->st_ino;
@@ -54,14 +75,9 @@ convert_stat(const struct stat *src, mrb_io_stat *dst)
dst->st_gid = (uint32_t)src->st_gid;
dst->st_rdev = (uint64_t)src->st_rdev;
dst->st_size = (int64_t)src->st_size;
/* Assign time values after undefinining macros */
#undef st_atime
#undef st_mtime
#undef st_ctime
dst->st_atime = (int64_t)atime;
dst->st_mtime = (int64_t)mtime;
dst->st_ctime = (int64_t)ctime;
dst->st_atime = (int64_t)atime_val;
dst->st_mtime = (int64_t)mtime_val;
dst->st_ctime = (int64_t)ctime_val;
#ifdef HAVE_STRUCT_STAT_ST_BLKSIZE
dst->st_blksize = (int64_t)src->st_blksize;
mrbgems/mruby-io/src/file.c
-3
View File
@@ -90,15 +90,12 @@
#endif
#if !defined(_WIN32) || defined(MRB_MINGW32_LEGACY)
typedef struct stat mrb_stat;
# define mrb_stat(path, sb) stat(path, sb)
# define mrb_fstat(fd, sb) fstat(fd, sb)
#elif defined MRB_INT32
typedef struct _stat32 mrb_stat;
# define mrb_stat(path, sb) _stat32(path, sb)
# define mrb_fstat(fd, sb) _fstat32(fd, sb)
#else
typedef struct _stat64 mrb_stat;
# define mrb_stat(path, sb) _stat64(path, sb)
# define mrb_fstat(fd, sb) _fstat64(fd, sb)
#endif