Merge branch 'acidanthera:master' into yaming-network

wy414012 · Jan 12, 2022 · 1432fe3 · 1432fe3
2 parents 953c16e + 48d7bbc
commit 1432fe3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 18 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,5 +1,8 @@
 Lilu Changelog
 ==============
+#### v1.6.0
+- Dropped internal shared patcher instance grabbing API
+
 #### v1.5.9
 - Fixed memory corruption when mixing cs_validate_range/page mid/long routes (thx @Goshin)
 - Enforced all routes to be slotted after one slotted route

diff --git a/Lilu/Headers/kern_api.hpp b/Lilu/Headers/kern_api.hpp
@@ -132,18 +132,6 @@ class LiluAPI {
 	 */
 	EXPORT Error onPatcherLoad(t_patcherLoaded callback, void *user=nullptr);
 
-#ifdef ACIDANTHERA_PRIVATE
-	/**
-	 *  Obtains kernel patcher shared instance.
-	 *
-	 *  WARNING: You can only safely use patcher within kext handling or patcher loading contexts. Using it outside
-	 *  is dangerous without extra knowledge.
-	 *
-	 *  @return KernelPatcher reference
-	 */
-	EXPORT KernelPatcher &getKernelPatcher();
-#endif
-
 	/**
 	 *  Registers custom provided callbacks for later invocation on kernel patcher initialisation
 	 *  Enforced version, which panics on registration failure (assuming your code cannot continue otherwise)

diff --git a/Lilu/Sources/kern_api.cpp b/Lilu/Sources/kern_api.cpp
@@ -5,8 +5,6 @@
 //  Copyright © 2016-2017 vit9696. All rights reserved.
 //
 
-#define ACIDANTHERA_PRIVATE
-
 #include <libkern/c++/OSObject.h>
 
 #include <Headers/kern_config.hpp>
@@ -131,10 +129,6 @@ LiluAPI::Error LiluAPI::onPatcherLoad(t_patcherLoaded callback, void *user) {
 	return Error::NoError;
 }
 
-KernelPatcher &LiluAPI::getKernelPatcher() {
-	return ADDPR(config).kernelPatcher;
-}
-
 LiluAPI::Error LiluAPI::onKextLoad(KernelPatcher::KextInfo *infos, size_t num, t_kextLoaded callback, void *user) {
 	// Store the callbacks first
 	if (callback) {