nn_sl: Fix c compiling

devkitPro · Apr 7, 2024 · 316ceea · 316ceea
1 parent 281c53b
commit 316ceea
Show file tree

Hide file tree

Showing 24 changed files with 9 additions and 25 deletions.
diff --git a/include/nn/sl/CacheManager.h b/include/nn/sl/CacheManager.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "ISerializer.h"
-#include "KillerNotification.h"
 #include <nn/result.h>
+#include <nn/sl/ISerializer.h>
+#include <nn/sl/KillerNotification.h>
 #include <nn/sl/sl_cpp.h>
 #include <wut.h>
 

diff --git a/include/nn/sl/IAccountInfoAccessor.h b/include/nn/sl/IAccountInfoAccessor.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <memory>
 #include <nn/result.h>
 #include <nn/sl/details/IAccountInfoAccessorDetails.h>
 #include <wut.h>

diff --git a/include/nn/sl/IBlackListAccessor.h b/include/nn/sl/IBlackListAccessor.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <memory>
 #include <nn/result.h>
 #include <nn/sl/details/IBlackListAccessorDetails.h>
 #include <nn/sl/sl_cpp.h>

diff --git a/include/nn/sl/IDefaultTitleAccessor.h b/include/nn/sl/IDefaultTitleAccessor.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <memory>
 #include <nn/result.h>
 #include <nn/sl/details/IDefaultTitleAccessorDetails.h>
 #include <nn/sl/sl_cpp.h>

diff --git a/include/nn/sl/IDiscCachedTitleAccessor.h b/include/nn/sl/IDiscCachedTitleAccessor.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <memory>
 #include <nn/result.h>
 #include <nn/sl/details/IDiscCachedTitleAccessorDetails.h>
 #include <nn/sl/sl_cpp.h>

diff --git a/include/nn/sl/IInstalledTitleListAccessor.h b/include/nn/sl/IInstalledTitleListAccessor.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <memory>
 #include <nn/result.h>
 #include <nn/sl/details/IInstalledTitleListAccessorDetails.h>
 #include <nn/sl/sl_cpp.h>

diff --git a/include/nn/sl/IKillerNotificationAccessor.h b/include/nn/sl/IKillerNotificationAccessor.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <memory>
 #include <nn/result.h>
 #include <nn/sl/details/IKillerNotificationAccessorDetails.h>
 #include <nn/sl/sl_cpp.h>

diff --git a/include/nn/sl/IMetaInfoAccessor.h b/include/nn/sl/IMetaInfoAccessor.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <memory>
 #include <nn/result.h>
 #include <nn/sl/details/IMetaInfoAccessorDetails.h>
 #include <nn/sl/sl_cpp.h>

diff --git a/include/nn/sl/IPreferentialTitleAccessor.h b/include/nn/sl/IPreferentialTitleAccessor.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <memory>
 #include <nn/result.h>
 #include <nn/sl/details/IPreferentialTitleAccessorDetails.h>
 #include <wut.h>

diff --git a/include/nn/sl/ISerializer.h b/include/nn/sl/ISerializer.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <coreinit/time.h>
-#include <memory>
 #include <nn/result.h>
 #include <nn/sl/KillerNotification.h>
 #include <nn/sl/details/ISerializerDetails.h>

diff --git a/include/nn/sl/ISettingAccessor.h b/include/nn/sl/ISettingAccessor.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <memory>
 #include <nn/result.h>
 #include <nn/sl/details/ISettingAccessorDetails.h>
 #include <nn/sl/sl_cpp.h>

diff --git a/include/nn/sl/ITimeAccessor.h b/include/nn/sl/ITimeAccessor.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <coreinit/time.h>
-#include <memory>
 #include <nn/result.h>
 #include <nn/sl/details/ITimeAccessorDetails.h>
 #include <nn/sl/sl_cpp.h>

diff --git a/include/nn/sl/ITitleIconCache.h b/include/nn/sl/ITitleIconCache.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <memory>
 #include <nn/result.h>
 #include <nn/sl/details/ITitleIconCacheDetails.h>
 #include <nn/sl/sl_cpp.h>

diff --git a/include/nn/sl/ITitleListAccessor.h b/include/nn/sl/ITitleListAccessor.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <memory>
 #include <nn/result.h>
 #include <nn/sl/details/ITitleListAccessorDetails.h>
 #include <nn/sl/sl_cpp.h>

diff --git a/include/nn/sl/ITransferrer.h b/include/nn/sl/ITransferrer.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <memory>
 #include <nn/result.h>
 #include <nn/sl/details/ITransferrerDetails.h>
 #include <nn/sl/sl_cpp.h>

diff --git a/include/nn/sl/IWhiteListAccessor.h b/include/nn/sl/IWhiteListAccessor.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <memory>
 #include <nn/result.h>
 #include <nn/sl/details/IWhiteListAccessorDetails.h>
 #include <nn/sl/sl_cpp.h>

diff --git a/include/nn/sl/TitleIconCache.h b/include/nn/sl/TitleIconCache.h
@@ -1,3 +1,7 @@
+#pragma once
+
+#ifdef __cplusplus
+
 #include <nn/sl/details/IIconInfoAccessorDetails.h>
 #include <nn/sl/details/ISerializerDetails.h>
 #include <nn/sl/details/ISettingAccessorDetails.h>
@@ -91,4 +95,6 @@ namespace nn::sl {
         details::TitleIconCacheInternal mInstance{};
     };
 
-} // namespace nn::sl
+} // namespace nn::sl
+
+#endif
diff --git a/include/nn/sl/details/IAccountInfoAccessorDetails.h b/include/nn/sl/details/IAccountInfoAccessorDetails.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <memory>
 #include <nn/result.h>
 #include <nn/sl/sl_cpp.h>
 #include <wut.h>

diff --git a/include/nn/sl/details/IPreferentialTitleAccessorDetails.h b/include/nn/sl/details/IPreferentialTitleAccessorDetails.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <memory>
 #include <nn/result.h>
 #include <nn/sl/sl_cpp.h>
 #include <wut.h>

diff --git a/include/nn/sl/details/ISerializerDetails.h b/include/nn/sl/details/ISerializerDetails.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <memory>
 #include <nn/result.h>
 #include <wut.h>
 

diff --git a/include/nn/sl/details/ISettingAccessorDetails.h b/include/nn/sl/details/ISettingAccessorDetails.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <memory>
 #include <nn/result.h>
 #include <nn/sl/sl_cpp.h>
 #include <wut.h>

diff --git a/include/nn/sl/details/ITimeAccessorDetails.h b/include/nn/sl/details/ITimeAccessorDetails.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <coreinit/time.h>
-#include <memory>
 #include <nn/result.h>
 #include <wut.h>
 

diff --git a/include/nn/sl/details/ITitleIconCacheDetails.h b/include/nn/sl/details/ITitleIconCacheDetails.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <memory>
 #include <nn/result.h>
 #include <nn/sl/sl_cpp.h>
 #include <wut.h>

diff --git a/include/nn/sl/details/ITransferrerDetails.h b/include/nn/sl/details/ITransferrerDetails.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <memory>
 #include <nn/result.h>
 #include <nn/sl/sl_cpp.h>
 #include <wut.h>