cleanup macros and fix linux macros

fnc12 · Feb 1, 2025 · a0e2aec · a0e2aec
1 parent 03a6ad2
commit a0e2aec
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 20 deletions.
diff --git a/dev/functional/config.h b/dev/functional/config.h
@@ -82,7 +82,7 @@
 
 #if defined(_WIN32)
 #define SQLITE_ORM_WIN
-#elif defined(__APPLE__) 
+#elif defined(__APPLE__) && defined(__MACH__)
 #define SQLITE_ORM_MAC
 #define SQLITE_ORM_UNIX
 #elif defined(__unix__) || defined(__unix) || defined(__linux__) || defined (__FreeBSD__) 

diff --git a/dev/vfs.h b/dev/vfs.h
@@ -7,20 +7,13 @@ namespace sqlite_orm {
 
     enum class vfs_t {
 
-#if defined(SQLITE_ORM_MAC) || defined(SQLITE_ORM_LINUX)
-
+#ifdef SQLITE_ORM_UNIX
         unix = 0,
         unix_posix = 0,
-        unix_dotfile = 1
-
+        unix_dotfile = 1,
 #ifdef SQLITE_ORM_MAC
-        ,
         unix_afp = 2,
-
-#elif defined(SQLITE_ORM_LINUX)
-
 #endif
-
 #endif
 
 #ifdef SQLITE_ORM_WIN

diff --git a/include/sqlite_orm/sqlite_orm.h b/include/sqlite_orm/sqlite_orm.h
@@ -274,7 +274,7 @@ using std::nullptr_t;
 
 #if defined(_WIN32)
 #define SQLITE_ORM_WIN
-#elif defined(__APPLE__)
+#elif defined(__APPLE__) && defined(__MACH__)
 #define SQLITE_ORM_MAC
 #define SQLITE_ORM_UNIX
 #elif defined(__unix__) || defined(__unix) || defined(__linux__) || defined(__FreeBSD__)
@@ -12212,20 +12212,13 @@ namespace sqlite_orm {
 
     enum class vfs_t {
 
-#if defined(SQLITE_ORM_MAC) || defined(SQLITE_ORM_LINUX)
-
+#ifdef SQLITE_ORM_UNIX
         unix = 0,
         unix_posix = 0,
-        unix_dotfile = 1
-
+        unix_dotfile = 1,
 #ifdef SQLITE_ORM_MAC
-        ,
         unix_afp = 2,
-
-#elif defined(SQLITE_ORM_LINUX)
-
 #endif
-
 #endif
 
 #ifdef SQLITE_ORM_WIN