diff options
| author | Chris Robinson <[email protected]> | 2019-06-10 21:45:33 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2019-06-10 21:45:33 -0700 |
| commit | c22d537d93a131215600373010b0d240e7b2c0df (patch) | |
| tree | 013d1cb346219c7ed8a566dd5c09d53529260a7b /Alc | |
| parent | 8bb42c2f9827d051d5bfb41ebdce5ac62454e620 (diff) | |
Remove some extern "C" blocks
Diffstat (limited to 'Alc')
| -rw-r--r-- | Alc/alconfig.cpp | 4 | ||||
| -rw-r--r-- | Alc/alconfig.h | 12 | ||||
| -rw-r--r-- | Alc/cpu_caps.h | 7 |
3 files changed, 3 insertions, 20 deletions
diff --git a/Alc/alconfig.cpp b/Alc/alconfig.cpp index c4fde638..db5251f0 100644 --- a/Alc/alconfig.cpp +++ b/Alc/alconfig.cpp @@ -285,7 +285,7 @@ void LoadConfigFromFile(std::istream &f) #ifdef _WIN32 -void ReadALConfig(void) noexcept +void ReadALConfig() { WCHAR buffer[MAX_PATH]; if(SHGetSpecialFolderPathW(nullptr, buffer, CSIDL_APPDATA, FALSE) != FALSE) @@ -321,7 +321,7 @@ void ReadALConfig(void) noexcept } } #else -void ReadALConfig(void) noexcept +void ReadALConfig() { const char *str{"/etc/openal/alsoft.conf"}; diff --git a/Alc/alconfig.h b/Alc/alconfig.h index 0e9bcec3..290172a8 100644 --- a/Alc/alconfig.h +++ b/Alc/alconfig.h @@ -1,14 +1,8 @@ #ifndef ALCONFIG_H #define ALCONFIG_H -#ifdef __cplusplus -#define NOEXCEPT noexcept -extern "C" { -#else -#define NOEXCEPT -#endif -void ReadALConfig(void) NOEXCEPT; +void ReadALConfig(); int ConfigValueExists(const char *devName, const char *blockName, const char *keyName); const char *GetConfigValue(const char *devName, const char *blockName, const char *keyName, const char *def); @@ -20,8 +14,4 @@ int ConfigValueUInt(const char *devName, const char *blockName, const char *keyN int ConfigValueFloat(const char *devName, const char *blockName, const char *keyName, float *ret); int ConfigValueBool(const char *devName, const char *blockName, const char *keyName, int *ret); -#ifdef __cplusplus -} // extern "C" -#endif - #endif /* ALCONFIG_H */ diff --git a/Alc/cpu_caps.h b/Alc/cpu_caps.h index 1d867f37..64a4ee45 100644 --- a/Alc/cpu_caps.h +++ b/Alc/cpu_caps.h @@ -1,9 +1,6 @@ #ifndef CPU_CAPS_H #define CPU_CAPS_H -#ifdef __cplusplus -extern "C" { -#endif extern int CPUCapFlags; enum { @@ -16,8 +13,4 @@ enum { void FillCPUCaps(int capfilter); -#ifdef __cplusplus -} // extern "C" -#endif - #endif /* CPU_CAPS_H */ |