Add undefine ALIGN if defined for jar_mx.h and updated android_main entrypoint in rcore_android.c per 5ed7905.

Author: damntourists

raylib/external/jar_xm.h

@@ -525,6 +525,10 @@ int jar_xm_create_context(jar_xm_context_t** ctxp, const char* moddata, uint32_t
     return jar_xm_create_context_safe(ctxp, moddata, SIZE_MAX, rate);
 }
 
+#ifdef ALIGN
+#undef ALIGN
+#endif
+
 #define ALIGN(x, b) (((x) + ((b) - 1)) & ~((b) - 1))
 #define ALIGN_PTR(x, b) (void*)(((uintptr_t)(x) + ((b) - 1)) & ~((b) - 1))
 int jar_xm_create_context_safe(jar_xm_context_t** ctxp, const char* moddata, size_t moddata_length, uint32_t rate) {

raylib/platforms/rcore_android.c

@@ -278,16 +278,18 @@ static GamepadButton AndroidTranslateGamepadButton(int button);
 
 // To allow easier porting to android, we allow the user to define a
 // main function which we call from android_main, defined by ourselves
-extern int main(int argc, char *argv[]);
+//extern int main(int argc, char *argv[]);
+extern void android_run();
 
 // Android main function
 void android_main(struct android_app *app)
 {
     char arg0[] = "raylib";     // NOTE: argv[] are mutable
     platform.app = app;
 
+    (void)android_run();
     // NOTE: Return from main is ignored
-    (void)main(1, (char *[]) { arg0, NULL });
+    //(void)main(1, (char *[]) { arg0, NULL });
 
     // Request to end the native activity
     ANativeActivity_finish(app->activity);