Changeset 1332

Timestamp:

01/02/25 02:05:32 (3 days ago)

Author:

Maciej Komosinski

Message:

Compatibility of file stat() and utime() with Embarcadero C++Builder compiler

File:

• cpp/common/virtfile/stdiofile.cpp (modified) (4 diffs)

cpp/common/virtfile/stdiofile.cpp

@@ -88 +88 @@
 bool StdioFileSystem::Vstat(const char* path, Stat* out)
 {
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__BORLANDC__)
         //under windows, there are a few choices of _statXX structures: 32bit, 64bit, ansi, widechar (and their corresponding _statXX() functions). For the future: ensure utf8 filenames work.
         using stat = struct _stat64i32; //"struct" because there is also a function with the same name
@@ -96 +96 @@
 #endif
         stat info;
+#ifdef __BORLANDC__
+    #define _stat(a,b) stat(a,b) //embarcadero uses "stat" as struct type and "stat()" as function
+#endif
         if (_stat(path, &info) != 0) return false;
         out->is_file = S_ISREG(info.st_mode);
@@ -108 +111 @@
 bool StdioFileSystem::Vsettime(const char* path, double timestamp)
 {
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__BORLANDC__)
         //under windows, there are a few choices of _statXX structures: 32bit, 64bit, ansi, widechar (and their corresponding _statXX() functions). For the future: ensure utf8 filenames work.
         using stat = struct _stat64i32; //"struct" because there is also a function with the same name
@@ -117 +120 @@
         stat info;
         if (_stat(path, &info) != 0) return false;
+#ifdef __BORLANDC__ // when including <utime.h> (no "sys/"), compiles OK when using both no-underscore variants, but causes "unresolved external utime()" during linking, hence need to use both underscored variants:
+    #define utimbuf _utimbuf
+    #define utime(a,b) _utime(a,b)
+#endif
         struct utimbuf times;
 #if defined IPHONE && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))