--- src/Types.h	2021-12-05 13:24:31.000000000 +0100
+++ src/Types.h	2023-09-10 12:25:38.000000000 +0200
@@ -94,13 +94,17 @@
  * Backwards compatibility with emule.
  * Note that the int* types are indeed unsigned.
  */
-typedef uint8_t		int8;
+//typedef uint8_t		int8;
+typedef __haiku_int8                    int8;
 typedef uint8_t		uint8;
-typedef uint16_t	int16;
+//typedef uint16_t	int16;
+typedef __haiku_int16                    int16;
 typedef uint16_t	uint16;
-typedef uint32_t	int32;
+//typedef uint32_t	int32;
+typedef __haiku_int32                    int32;
 typedef uint32_t	uint32;
-typedef uint64_t	int64;
+//typedef uint64_t	int64;
+typedef __haiku_int64                    int64;
 typedef uint64_t	uint64;
 typedef int8_t		sint8;
 typedef int16_t		sint16;

--- src/amule.cpp	2021-12-05 13:24:31.000000000 +0100
+++ src/amule.cpp	2023-09-10 20:33:54.000000000 +0200
@@ -391,7 +391,7 @@
 #endif

 	// Handle uncaught exceptions
-	InstallMuleExceptionHandler();
+//	InstallMuleExceptionHandler();

 	if (!InitCommon(AMULE_APP_BASE::argc, AMULE_APP_BASE::argv)) {
 		return false;
--- src/libs/common/MuleDebug.cpp	2021-12-05 13:24:31.000000000 +0100
+++ src/libs/common/MuleDebug.cpp	2023-09-09 21:09:09.000000000 +0200
@@ -67,7 +67,7 @@
 	// Revert to the original exception handler, to avoid
 	// infinate recursion, in case something goes wrong in
 	// this function.
-	std::set_terminate(std::abort);
+//	std::set_terminate(std::abort);

 #ifdef HAVE_CXXABI
 	std::type_info *t = __cxxabiv1::__cxa_current_exception_type();
@@ -108,10 +108,10 @@
 }


-void InstallMuleExceptionHandler()
-{
-	std::set_terminate(OnUnhandledException);
-}
+//void InstallMuleExceptionHandler()
+//{
+//	std::set_terminate(OnUnhandledException);
+//}