fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-09-13 02:42:09 +02:00
Code Issues Packages Projects Releases 10 Wiki Activity

Global: replaces __auto_type to auto

Browse Source
This commit is contained in:
李通洲
2026-07-11 11:23:41 +08:00
parent 9d6bb7d717
commit 75f00af98d
3 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/library.h
+6 -10
View File
@@ -28,10 +28,6 @@ static inline void ffLibraryUnload(void** handle) {
}
}
#if __cplusplus
#define __auto_type auto
#endif
#define FF_LIBRARY_SYMBOL(symbolName) \
typeof(&symbolName) ff##symbolName;
@@ -50,13 +46,13 @@ static inline void ffLibraryUnload(void** handle) {
return returnValue;
#define FF_LIBRARY_LOAD_SYMBOL(library, symbolName, returnValue) \
__auto_type FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, ff##symbolName, symbolName, returnValue);
auto FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, ff##symbolName, symbolName, returnValue);
#define FF_LIBRARY_LOAD_SYMBOL_LAZY(library, symbolName) \
__auto_type ff##symbolName = (typeof(&symbolName)) dlsym(library, #symbolName);
auto ff##symbolName = (typeof(&symbolName)) dlsym(library, #symbolName);
#define FF_LIBRARY_LOAD_SYMBOL_MESSAGE(library, symbolName) \
__auto_type FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, ff##symbolName, symbolName, "dlsym " #symbolName " failed");
auto FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, ff##symbolName, symbolName, "dlsym " #symbolName " failed");
#define FF_LIBRARY_LOAD_SYMBOL_VAR(library, varName, symbolName, returnValue) \
FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, (varName).ff##symbolName, symbolName, returnValue);
@@ -87,13 +83,13 @@ void* ffLibraryLoadMulti(const char* path, int maxVersion, ...);
symbolMapping = (typeof(&symbolName)) &symbolName;
#define FF_LIBRARY_LOAD_SYMBOL(library, symbolName, returnValue) \
[[maybe_unused]] __auto_type FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, ff##symbolName, symbolName, returnValue);
[[maybe_unused]] auto FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, ff##symbolName, symbolName, returnValue);
#define FF_LIBRARY_LOAD_SYMBOL_LAZY(library, symbolName) \
[[maybe_unused]] __auto_type ff##symbolName = (typeof(&symbolName)) &symbolName;
[[maybe_unused]] auto ff##symbolName = (typeof(&symbolName)) &symbolName;
#define FF_LIBRARY_LOAD_SYMBOL_MESSAGE(library, symbolName) \
[[maybe_unused]] __auto_type FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, ff##symbolName, symbolName, "dlsym " #symbolName " failed");
[[maybe_unused]] auto FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, ff##symbolName, symbolName, "dlsym " #symbolName " failed");
#define FF_LIBRARY_LOAD_SYMBOL_VAR(library, varName, symbolName, returnValue) \
FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, (varName).ff##symbolName, symbolName, returnValue);
src/common/windows/nt.h
+1 -1
View File
@@ -604,7 +604,7 @@ typedef struct _KUSER_SHARED_DATA {
#ifdef __aarch64__
#define SharedUserData ({ \
__auto_type shared_user_data = (const volatile KUSER_SHARED_DATA*) (uintptr_t) 0x7FFE0000UL; \
auto shared_user_data = (const volatile KUSER_SHARED_DATA*) (uintptr_t) 0x7FFE0000UL; \
__asm__("" : "+r"(shared_user_data)); /* https://github.com/lhmouse/mcfgthread/issues/330 */ \
shared_user_data; \
})
src/detection/physicaldisk/physicaldisk_windows.c
+2 -2
View File
@@ -245,14 +245,14 @@ static const char* detectPhysicalDisk(const char* physicalType, const wchar_t* s
gmt->MediaInfoCount > 0) {
// DiskInfo and RemovableDiskInfo have the same structures. TapeInfo doesn't.
if (gmt->DeviceType != FILE_DEVICE_TAPE) {
__auto_type diskInfo = &gmt->MediaInfo[0].DeviceSpecific.DiskInfo;
auto diskInfo = &gmt->MediaInfo[0].DeviceSpecific.DiskInfo;
if (diskInfo->MediaCharacteristics & MEDIA_READ_ONLY) {
device->type |= FF_PHYSICALDISK_TYPE_READONLY;
} else if (diskInfo->MediaCharacteristics & MEDIA_READ_WRITE) {
device->type |= FF_PHYSICALDISK_TYPE_READWRITE;
}
} else {
__auto_type tapeInfo = &gmt->MediaInfo[0].DeviceSpecific.TapeInfo;
auto tapeInfo = &gmt->MediaInfo[0].DeviceSpecific.TapeInfo;
if (tapeInfo->MediaCharacteristics & MEDIA_READ_ONLY) {
device->type |= FF_PHYSICALDISK_TYPE_READONLY;
} else if (tapeInfo->MediaCharacteristics & MEDIA_READ_WRITE) {