Mercurial > molko

changeset 462:5729efd23286

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
core: core -> mlk_core
author David Demelier <markand@malikania.fr>
date Mon, 27 Feb 2023 09:52:55 +0100
parents d7874f11565f
children 61f2334e1c54
files examples/example-action/example-action.c examples/example-animation/example-animation.c examples/example-audio/example-audio.c examples/example-battle/example-battle.c examples/example-cursor/example-cursor.c examples/example-debug/example-debug.c examples/example-drawable/example-drawable.c examples/example-font/example-font.c examples/example-gridmenu/example-gridmenu.c examples/example-label/example-label.c examples/example-message/example-message.c examples/example-notify/example-notify.c examples/example-sprite/example-sprite.c examples/example-trace/example-trace.c examples/example-ui/example-ui.c libmlk-core/mlk/core/action-stack.h libmlk-core/mlk/core/action.h libmlk-core/mlk/core/alloc.h libmlk-core/mlk/core/animation.h libmlk-core/mlk/core/clock.h libmlk-core/mlk/core/core.c libmlk-core/mlk/core/core.h libmlk-core/mlk/core/drawable-stack.h libmlk-core/mlk/core/drawable.h libmlk-core/mlk/core/error.h libmlk-core/mlk/core/event.h libmlk-core/mlk/core/font.h libmlk-core/mlk/core/game.h libmlk-core/mlk/core/gamepad.h libmlk-core/mlk/core/image.h libmlk-core/mlk/core/maths.h libmlk-core/mlk/core/music.h libmlk-core/mlk/core/painter.h libmlk-core/mlk/core/panic.h libmlk-core/mlk/core/script.h libmlk-core/mlk/core/sound.h libmlk-core/mlk/core/sprite.h libmlk-core/mlk/core/state.h libmlk-core/mlk/core/sys.h libmlk-core/mlk/core/texture.h libmlk-core/mlk/core/trace.h libmlk-core/mlk/core/util.h libmlk-core/mlk/core/window.h libmlk-rpg/mlk/rpg/battle-bar-default.h libmlk-rpg/mlk/rpg/battle-bar.h libmlk-rpg/mlk/rpg/battle-entity-state.h libmlk-rpg/mlk/rpg/battle-entity.h libmlk-rpg/mlk/rpg/battle-indicator.h libmlk-rpg/mlk/rpg/battle-message.h libmlk-rpg/mlk/rpg/battle-state.h libmlk-rpg/mlk/rpg/battle.h libmlk-rpg/mlk/rpg/character.h libmlk-rpg/mlk/rpg/equipment.h libmlk-rpg/mlk/rpg/inventory.h libmlk-rpg/mlk/rpg/item.h libmlk-rpg/mlk/rpg/map-file.h libmlk-rpg/mlk/rpg/map.h libmlk-rpg/mlk/rpg/message.h libmlk-rpg/mlk/rpg/property.h libmlk-rpg/mlk/rpg/quest.h libmlk-rpg/mlk/rpg/rpg.h libmlk-rpg/mlk/rpg/save.h libmlk-rpg/mlk/rpg/selection.h libmlk-rpg/mlk/rpg/spell.h libmlk-rpg/mlk/rpg/tileset-file.h libmlk-rpg/mlk/rpg/tileset.h libmlk-rpg/mlk/rpg/walksprite.h libmlk-ui/mlk/ui/align.h libmlk-ui/mlk/ui/button.h libmlk-ui/mlk/ui/checkbox.h libmlk-ui/mlk/ui/debug.h libmlk-ui/mlk/ui/frame.h libmlk-ui/mlk/ui/gridmenu.h libmlk-ui/mlk/ui/label.h libmlk-ui/mlk/ui/notify.h libmlk-ui/mlk/ui/theme.h libmlk-ui/mlk/ui/ui.h tests/test-map.c tests/test-tileset.c
diffstat 79 files changed, 161 insertions(+), 161 deletions(-) [+]
line wrap: on
line diff
--- a/examples/example-action/example-action.c	Mon Feb 27 09:46:20 2023 +0100
+++ b/examples/example-action/example-action.c	Mon Feb 27 09:52:55 2023 +0100
@@ -336,7 +336,7 @@
 static void
 init(void)
 {
-	if (core_init("fr.malikania", "example-action") < 0 || ui_init() < 0 || rpg_init() < 0)
+	if (mlk_core_init("fr.malikania", "example-action") < 0 || ui_init() < 0 || rpg_init() < 0)
 		panic();
 	if (window_open("Example - Action", W, H) < 0)
 		panic();
@@ -407,7 +407,7 @@
 	window_finish();
 	rpg_finish();
 	ui_finish();
-	core_finish();
+	mlk_core_finish();
 }
 
 int
--- a/examples/example-animation/example-animation.c	Mon Feb 27 09:46:20 2023 +0100
+++ b/examples/example-animation/example-animation.c	Mon Feb 27 09:52:55 2023 +0100
@@ -54,7 +54,7 @@
 static void
 init(void)
 {
-	if (core_init("fr.malikania", "example-animation") < 0 || ui_init() < 0)
+	if (mlk_core_init("fr.malikania", "example-animation") < 0 || ui_init() < 0)
 		panic();
 	if (window_open("Example - Animation", W, H) < 0)
 		panic();
@@ -132,7 +132,7 @@
 {
 	window_finish();
 	ui_finish();
-	core_finish();
+	mlk_core_finish();
 }
 
 int
--- a/examples/example-audio/example-audio.c	Mon Feb 27 09:46:20 2023 +0100
+++ b/examples/example-audio/example-audio.c	Mon Feb 27 09:52:55 2023 +0100
@@ -59,7 +59,7 @@
 static void
 init(void)
 {
-	if (core_init("fr.malikania", "example-audio") < 0 || ui_init() < 0)
+	if (mlk_core_init("fr.malikania", "example-audio") < 0 || ui_init() < 0)
 		panic();
 	if (window_open("Example - Audio", W, H) < 0)
 		panic();
@@ -73,7 +73,7 @@
 {
 	window_finish();
 	ui_finish();
-	core_finish();
+	mlk_core_finish();
 }
 
 static void
--- a/examples/example-battle/example-battle.c	Mon Feb 27 09:46:20 2023 +0100
+++ b/examples/example-battle/example-battle.c	Mon Feb 27 09:52:55 2023 +0100
@@ -130,7 +130,7 @@
 static void
 init(void)
 {
-	if (core_init("fr.malikania", "example-battle") < 0 || ui_init() < 0 || rpg_init() < 0)
+	if (mlk_core_init("fr.malikania", "example-battle") < 0 || ui_init() < 0 || rpg_init() < 0)
 		panic();
 	if (window_open("Example - Battle", W, H) < 0)
 		panic();
--- a/examples/example-cursor/example-cursor.c	Mon Feb 27 09:46:20 2023 +0100
+++ b/examples/example-cursor/example-cursor.c	Mon Feb 27 09:52:55 2023 +0100
@@ -49,7 +49,7 @@
 static void
 init(void)
 {
-	if (core_init("fr.malikania", "example-cursor") < 0 || ui_init() < 0)
+	if (mlk_core_init("fr.malikania", "example-cursor") < 0 || ui_init() < 0)
 		panic();
 	if (window_open("Example - Cursor", W, H) < 0)
 		panic();
@@ -133,7 +133,7 @@
 {
 	window_finish();
 	ui_finish();
-	core_finish();
+	mlk_core_finish();
 }
 
 int
--- a/examples/example-debug/example-debug.c	Mon Feb 27 09:46:20 2023 +0100
+++ b/examples/example-debug/example-debug.c	Mon Feb 27 09:52:55 2023 +0100
@@ -39,7 +39,7 @@
 static void
 init(void)
 {
-	if (core_init("fr.malikania", "example-debug") < 0 || ui_init() < 0)
+	if (mlk_core_init("fr.malikania", "example-debug") < 0 || ui_init() < 0)
 		panic();
 	if (window_open("Example - Debug", W, H) < 0)
 		panic();
@@ -97,7 +97,7 @@
 {
 	window_finish();
 	ui_finish();
-	core_finish();
+	mlk_core_finish();
 }
 
 int
--- a/examples/example-drawable/example-drawable.c	Mon Feb 27 09:46:20 2023 +0100
+++ b/examples/example-drawable/example-drawable.c	Mon Feb 27 09:52:55 2023 +0100
@@ -74,7 +74,7 @@
 static void
 init(void)
 {
-	if (core_init("fr.malikania", "example-drawable") < 0 || ui_init() < 0)
+	if (mlk_core_init("fr.malikania", "example-drawable") < 0 || ui_init() < 0)
 		panic();
 	if (window_open("Example - Drawable", W, H) < 0)
 		panic();
@@ -193,7 +193,7 @@
 {
 	window_finish();
 	ui_finish();
-	core_finish();
+	mlk_core_finish();
 }
 
 int
--- a/examples/example-font/example-font.c	Mon Feb 27 09:46:20 2023 +0100
+++ b/examples/example-font/example-font.c	Mon Feb 27 09:52:55 2023 +0100
@@ -53,7 +53,7 @@
 static void
 init(void)
 {
-	if (core_init("fr.malikania", "example-font") < 0 || ui_init() < 0)
+	if (mlk_core_init("fr.malikania", "example-font") < 0 || ui_init() < 0)
 		panic();
 	if (window_open("Example - Font", W, H) < 0)
 		panic();
@@ -131,7 +131,7 @@
 {
 	window_finish();
 	ui_finish();
-	core_finish();
+	mlk_core_finish();
 }
 
 int
--- a/examples/example-gridmenu/example-gridmenu.c	Mon Feb 27 09:46:20 2023 +0100
+++ b/examples/example-gridmenu/example-gridmenu.c	Mon Feb 27 09:52:55 2023 +0100
@@ -41,7 +41,7 @@
 static void
 init(void)
 {
-	if (core_init("fr.malikania", "example-gridmenu") < 0 || ui_init() < 0)
+	if (mlk_core_init("fr.malikania", "example-gridmenu") < 0 || ui_init() < 0)
 		panic();
 	if (window_open("Example - Grid menu", W, H) < 0)
 		panic();
@@ -52,7 +52,7 @@
 {
 	window_finish();
 	ui_finish();
-	core_finish();
+	mlk_core_finish();
 }
 
 static void
--- a/examples/example-label/example-label.c	Mon Feb 27 09:46:20 2023 +0100
+++ b/examples/example-label/example-label.c	Mon Feb 27 09:52:55 2023 +0100
@@ -106,7 +106,7 @@
 static void
 init(void)
 {
-	if (core_init("fr.malikania", "example-label") < 0 || ui_init() < 0)
+	if (mlk_core_init("fr.malikania", "example-label") < 0 || ui_init() < 0)
 		panic();
 	if (window_open("Example - Label", W, H) < 0)
 		panic();
@@ -125,7 +125,7 @@
 {
 	window_finish();
 	ui_finish();
-	core_finish();
+	mlk_core_finish();
 }
 
 static void
--- a/examples/example-message/example-message.c	Mon Feb 27 09:46:20 2023 +0100
+++ b/examples/example-message/example-message.c	Mon Feb 27 09:52:55 2023 +0100
@@ -48,7 +48,7 @@
 static void
 init(void)
 {
-	if (core_init("fr.malikania", "example-message") < 0 || ui_init() < 0 || rpg_init() < 0)
+	if (mlk_core_init("fr.malikania", "example-message") < 0 || ui_init() < 0 || rpg_init() < 0)
 		panic();
 	if (window_open("Example - Message", W, H) < 0)
 		panic();
@@ -60,7 +60,7 @@
 	window_finish();
 	rpg_finish();
 	ui_finish();
-	core_finish();
+	mlk_core_finish();
 }
 
 static void
--- a/examples/example-notify/example-notify.c	Mon Feb 27 09:46:20 2023 +0100
+++ b/examples/example-notify/example-notify.c	Mon Feb 27 09:52:55 2023 +0100
@@ -51,7 +51,7 @@
 static void
 init(void)
 {
-	if (core_init("fr.malikania", "example-notify") < 0 || ui_init() < 0)
+	if (mlk_core_init("fr.malikania", "example-notify") < 0 || ui_init() < 0)
 		panic();
 	if (window_open("Example - Notify", W, H) < 0)
 		panic();
@@ -116,7 +116,7 @@
 {
 	window_finish();
 	ui_finish();
-	core_finish();
+	mlk_core_finish();
 }
 
 int
--- a/examples/example-sprite/example-sprite.c	Mon Feb 27 09:46:20 2023 +0100
+++ b/examples/example-sprite/example-sprite.c	Mon Feb 27 09:52:55 2023 +0100
@@ -65,7 +65,7 @@
 static void
 init(void)
 {
-	if (core_init("fr.malikania", "example-sprite") < 0 || ui_init() < 0)
+	if (mlk_core_init("fr.malikania", "example-sprite") < 0 || ui_init() < 0)
 		panic();
 	if (window_open("Example - Sprite", W, H) < 0)
 		panic();
@@ -149,7 +149,7 @@
 	texture_finish(&texture);
 	window_finish();
 	ui_finish();
-	core_finish();
+	mlk_core_finish();
 }
 
 int
--- a/examples/example-trace/example-trace.c	Mon Feb 27 09:46:20 2023 +0100
+++ b/examples/example-trace/example-trace.c	Mon Feb 27 09:52:55 2023 +0100
@@ -40,7 +40,7 @@
 static void
 init(void)
 {
-	if (core_init("fr.malikania", "example-trace") < 0 || ui_init() < 0)
+	if (mlk_core_init("fr.malikania", "example-trace") < 0 || ui_init() < 0)
 		panic();
 	if (window_open("Example - Trace", W, H) < 0)
 		panic();
@@ -113,7 +113,7 @@
 {
 	window_finish();
 	ui_finish();
-	core_finish();
+	mlk_core_finish();
 }
 
 int
--- a/examples/example-ui/example-ui.c	Mon Feb 27 09:46:20 2023 +0100
+++ b/examples/example-ui/example-ui.c	Mon Feb 27 09:52:55 2023 +0100
@@ -123,7 +123,7 @@
 static void
 init(void)
 {
-	if (core_init("fr.malikania", "example-ui") < 0 || ui_init() < 0)
+	if (mlk_core_init("fr.malikania", "example-ui") < 0 || ui_init() < 0)
 		panic();
 	if (window_open("Example - UI", W, H) < 0)
 		panic();
@@ -271,7 +271,7 @@
 {
 	window_finish();
 	ui_finish();
-	core_finish();
+	mlk_core_finish();
 }
 
 int
--- a/libmlk-core/mlk/core/action-stack.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-core/mlk/core/action-stack.h	Mon Feb 27 09:52:55 2023 +0100
@@ -32,7 +32,7 @@
 	size_t actionsz;
 };
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 void
 mlk_action_stack_init(struct mlk_action_stack *, struct mlk_action **, size_t);
@@ -55,6 +55,6 @@
 void
 mlk_action_stack_finish(struct mlk_action_stack *);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_CORE_ACTION_STACK_H */
--- a/libmlk-core/mlk/core/action.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-core/mlk/core/action.h	Mon Feb 27 09:52:55 2023 +0100
@@ -32,7 +32,7 @@
 	void (*finish)(struct mlk_action *);
 };
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 void
 mlk_action_handle(struct mlk_action *, const union mlk_event *);
@@ -49,6 +49,6 @@
 void
 mlk_action_finish(struct mlk_action *);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_CORE_ACTION_H */
--- a/libmlk-core/mlk/core/alloc.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-core/mlk/core/alloc.h	Mon Feb 27 09:52:55 2023 +0100
@@ -39,7 +39,7 @@
 	void (*finalizer)(void *);
 };
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 /* allocator functions. */
 void
@@ -85,6 +85,6 @@
 void
 mlk_alloc_pool_finish(struct mlk_alloc_pool *);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_CORE_ALLOC_H */
--- a/libmlk-core/mlk/core/animation.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-core/mlk/core/animation.h	Mon Feb 27 09:52:55 2023 +0100
@@ -32,7 +32,7 @@
 	unsigned int elapsed;
 };
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 void
 mlk_animation_init(struct mlk_animation *, const struct sprite *, unsigned int);
@@ -52,6 +52,6 @@
 void
 mlk_animation_drawable(struct mlk_animation *, struct mlk_drawable *, int, int);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_CORE_ANIMATION_H */
--- a/libmlk-core/mlk/core/clock.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-core/mlk/core/clock.h	Mon Feb 27 09:52:55 2023 +0100
@@ -25,7 +25,7 @@
 	unsigned int ticks;
 };
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 void
 mlk_clock_start(struct mlk_clock *);
@@ -33,6 +33,6 @@
 unsigned int
 mlk_clock_elapsed(const struct mlk_clock *);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_CORE_CLOCK_H */
--- a/libmlk-core/mlk/core/core.c	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-core/mlk/core/core.c	Mon Feb 27 09:52:55 2023 +0100
@@ -25,7 +25,7 @@
 #include "sys.h"
 
 int
-core_init(const char *organization, const char *name)
+mlk_core_init(const char *organization, const char *name)
 {
 	assert(organization);
 	assert(name);
@@ -39,7 +39,7 @@
 }
 
 void
-core_finish(void)
+mlk_core_finish(void)
 {
 	sys_finish();
 }
--- a/libmlk-core/mlk/core/core.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-core/mlk/core/core.h	Mon Feb 27 09:52:55 2023 +0100
@@ -20,21 +20,21 @@
 #define MLK_CORE_CORE_H
 
 #if defined(__cplusplus)
-#       define CORE_BEGIN_DECLS extern "C" {
-#       define CORE_END_DECLS }
+#       define MLK_CORE_BEGIN_DECLS extern "C" {
+#       define MLK_CORE_END_DECLS }
 #else
-#       define CORE_BEGIN_DECLS
-#       define CORE_END_DECLS
+#       define MLK_CORE_BEGIN_DECLS
+#       define MLK_CORE_END_DECLS
 #endif
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 int
-core_init(const char *, const char *);
+mlk_core_init(const char *, const char *);
 
 void
-core_finish(void);
+mlk_core_finish(void);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_CORE_CORE_H */
--- a/libmlk-core/mlk/core/drawable-stack.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-core/mlk/core/drawable-stack.h	Mon Feb 27 09:52:55 2023 +0100
@@ -28,7 +28,7 @@
 	size_t objectsz;
 };
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 void
 mlk_drawable_stack_init(struct mlk_drawable_stack *, struct mlk_drawable **, size_t);
@@ -48,6 +48,6 @@
 void
 mlk_drawable_stack_finish(struct mlk_drawable_stack *);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_CORE_DRAWABLE_STACK_H */
--- a/libmlk-core/mlk/core/drawable.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-core/mlk/core/drawable.h	Mon Feb 27 09:52:55 2023 +0100
@@ -31,7 +31,7 @@
 	void (*finish)(struct mlk_drawable *);
 };
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 int
 mlk_drawable_update(struct mlk_drawable *, unsigned int);
@@ -45,6 +45,6 @@
 void
 mlk_drawable_finish(struct mlk_drawable *);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_CORE_DRAWABLE_H */
--- a/libmlk-core/mlk/core/error.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-core/mlk/core/error.h	Mon Feb 27 09:52:55 2023 +0100
@@ -23,7 +23,7 @@
 
 #include "core.h"
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 const char *
 error(void);
@@ -34,6 +34,6 @@
 int
 errorva(const char *, va_list);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_CORE_ERROR_H */
--- a/libmlk-core/mlk/core/event.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-core/mlk/core/event.h	Mon Feb 27 09:52:55 2023 +0100
@@ -77,11 +77,11 @@
 	struct mlk_event_axis axis;
 };
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 int
 mlk_event_poll(union mlk_event *);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_CORE_EVENT_H */
--- a/libmlk-core/mlk/core/font.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-core/mlk/core/font.h	Mon Feb 27 09:52:55 2023 +0100
@@ -36,7 +36,7 @@
 	void *handle;
 };
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 int
 mlk_font_open(struct mlk_font *, const char *, unsigned int);
@@ -59,6 +59,6 @@
 void
 mlk_font_finish(struct mlk_font *);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_CORE_FONT_H */
--- a/libmlk-core/mlk/core/game.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-core/mlk/core/game.h	Mon Feb 27 09:52:55 2023 +0100
@@ -37,7 +37,7 @@
 
 extern struct mlk_game game;
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 void
 mlk_game_init(struct state **, size_t);
@@ -63,6 +63,6 @@
 void
 mlk_game_quit(void);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_CORE_GAME_H */
--- a/libmlk-core/mlk/core/gamepad.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-core/mlk/core/gamepad.h	Mon Feb 27 09:52:55 2023 +0100
@@ -21,7 +21,7 @@
 
 #include "core.h"
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 enum mlk_gamepad_button {
 	MLK_GAMEPAD_BUTTON_UNKNOWN,
@@ -75,6 +75,6 @@
 int
 mlk_gamepad_iter_next(struct mlk_gamepad_iter *);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_CORE_GAMEPAD_H */
--- a/libmlk-core/mlk/core/image.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-core/mlk/core/image.h	Mon Feb 27 09:52:55 2023 +0100
@@ -25,7 +25,7 @@
 
 struct texture;
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 int
 mlk_image_open(struct texture *, const char *);
@@ -33,6 +33,6 @@
 int
 mlk_image_openmem(struct texture *, const void *, size_t);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_CORE_IMAGE_H */
--- a/libmlk-core/mlk/core/maths.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-core/mlk/core/maths.h	Mon Feb 27 09:52:55 2023 +0100
@@ -21,7 +21,7 @@
 
 #include "core.h"
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 int
 mlk_maths_is_boxed(int, int, unsigned int, unsigned int, int, int);
@@ -29,6 +29,6 @@
 float
 mlk_maths_scale(float, float, float, float, float);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_CORE_MATHS_H */
--- a/libmlk-core/mlk/core/music.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-core/mlk/core/music.h	Mon Feb 27 09:52:55 2023 +0100
@@ -32,7 +32,7 @@
 	void *handle;
 };
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 int
 mlk_music_open(struct mlk_music *, const char *);
@@ -58,6 +58,6 @@
 void
 mlk_music_finish(struct mlk_music *);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_CORE_MUSIC_H */
--- a/libmlk-core/mlk/core/painter.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-core/mlk/core/painter.h	Mon Feb 27 09:52:55 2023 +0100
@@ -23,7 +23,7 @@
 
 struct texture;
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 struct texture *
 mlk_painter_get_target(void);
@@ -55,7 +55,7 @@
 void
 mlk_painter_present(void);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #define MLK_PAINTER_BEGIN(tex)                                          \
 do {                                                                    \
--- a/libmlk-core/mlk/core/panic.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-core/mlk/core/panic.h	Mon Feb 27 09:52:55 2023 +0100
@@ -26,7 +26,7 @@
 extern void (*panic_handler)(void);
 extern void *panic_data;
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 void
 panicf(const char *, ...);
@@ -37,6 +37,6 @@
 void
 panic(void);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_CORE_PANIC_H */
--- a/libmlk-core/mlk/core/script.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-core/mlk/core/script.h	Mon Feb 27 09:52:55 2023 +0100
@@ -35,7 +35,7 @@
 	size_t cur;
 };
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 void
 script_init(struct script *);
@@ -61,6 +61,6 @@
 void
 script_action(struct script *s, struct mlk_action *);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_CORE_SCRIPT_H */
--- a/libmlk-core/mlk/core/sound.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-core/mlk/core/sound.h	Mon Feb 27 09:52:55 2023 +0100
@@ -32,7 +32,7 @@
 	int channel;
 };
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 int
 sound_open(struct sound *, const char *);
@@ -61,6 +61,6 @@
 void
 sound_finish(struct sound *);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_CORE_SOUND_H */
--- a/libmlk-core/mlk/core/sprite.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-core/mlk/core/sprite.h	Mon Feb 27 09:52:55 2023 +0100
@@ -31,7 +31,7 @@
 	unsigned int ncols;
 };
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 void
 sprite_init(struct sprite *, struct texture *, unsigned int, unsigned int);
@@ -51,6 +51,6 @@
              unsigned int,
              unsigned int);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_CORE_SPRITE_H */
--- a/libmlk-core/mlk/core/state.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-core/mlk/core/state.h	Mon Feb 27 09:52:55 2023 +0100
@@ -35,7 +35,7 @@
 	void (*finish)(struct state *);
 };
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 void
 state_start(struct state *);
@@ -61,6 +61,6 @@
 void
 state_finish(struct state *);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_CORE_STATE_H */
--- a/libmlk-core/mlk/core/sys.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-core/mlk/core/sys.h	Mon Feb 27 09:52:55 2023 +0100
@@ -27,7 +27,7 @@
 	SYS_DIR_SAVE
 };
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 int
 sys_init(const char *, const char *);
@@ -41,6 +41,6 @@
 void
 sys_finish(void);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_CORE_SYS_H */
--- a/libmlk-core/mlk/core/texture.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-core/mlk/core/texture.h	Mon Feb 27 09:52:55 2023 +0100
@@ -36,7 +36,7 @@
 	TEXTURE_BLEND_LAST
 };
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 int
 texture_new(struct texture *, unsigned int, unsigned int);
@@ -71,6 +71,6 @@
 void
 texture_finish(struct texture *);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_CORE_TEXTURE_H */
--- a/libmlk-core/mlk/core/trace.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-core/mlk/core/trace.h	Mon Feb 27 09:52:55 2023 +0100
@@ -28,7 +28,7 @@
 extern void (*trace_handler)(const char *);
 extern void *trace_data;
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 void
 tracef(const char *, ...);
@@ -36,6 +36,6 @@
 void
 traceva(const char *, va_list);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_CORE_TRACE_H */
--- a/libmlk-core/mlk/core/util.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-core/mlk/core/util.h	Mon Feb 27 09:52:55 2023 +0100
@@ -23,7 +23,7 @@
 
 #define UTIL_SIZE(x) sizeof ((x)) / sizeof ((x)[0])
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 void
 util_delay(unsigned int);
@@ -34,6 +34,6 @@
 unsigned int
 util_nrand(unsigned int, unsigned int);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_CORE_UTIL_H */
--- a/libmlk-core/mlk/core/window.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-core/mlk/core/window.h	Mon Feb 27 09:52:55 2023 +0100
@@ -41,7 +41,7 @@
 
 extern struct window window;
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 int
 window_open(const char *, unsigned int, unsigned int);
@@ -52,6 +52,6 @@
 void
 window_finish(void);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_CORE_WINDOW_H */
--- a/libmlk-rpg/mlk/rpg/battle-bar-default.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-rpg/mlk/rpg/battle-bar-default.h	Mon Feb 27 09:52:55 2023 +0100
@@ -59,7 +59,7 @@
 	struct gridmenu grid;
 };
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 void
 battle_bar_default_init(struct battle_bar_default *);
@@ -88,6 +88,6 @@
 void
 battle_bar_default(struct battle_bar_default *, struct battle_bar *);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_RPG_BATTLE_BAR_DEFAULT_H */
--- a/libmlk-rpg/mlk/rpg/battle-bar.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-rpg/mlk/rpg/battle-bar.h	Mon Feb 27 09:52:55 2023 +0100
@@ -36,7 +36,7 @@
 	void (*finish)(struct battle_bar *, struct battle *);
 };
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 void
 battle_bar_start(struct battle_bar *, struct battle *);
@@ -56,6 +56,6 @@
 void
 battle_bar_finish(struct battle_bar *, struct battle *);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_RPG_BATTLE_BAR_H */
--- a/libmlk-rpg/mlk/rpg/battle-entity-state.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-rpg/mlk/rpg/battle-entity-state.h	Mon Feb 27 09:52:55 2023 +0100
@@ -31,7 +31,7 @@
 	void (*finish)(struct battle_entity_state *, struct battle_entity *);
 };
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 int
 battle_entity_state_update(struct battle_entity_state *, struct battle_entity *, unsigned int);
@@ -42,6 +42,6 @@
 void
 battle_entity_state_finish(struct battle_entity_state *, struct battle_entity *);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_RPG_BATTLE_ENTITY_STATE_H */
--- a/libmlk-rpg/mlk/rpg/battle-entity.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-rpg/mlk/rpg/battle-entity.h	Mon Feb 27 09:52:55 2023 +0100
@@ -35,7 +35,7 @@
 	struct battle_entity_state *state;
 };
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 void
 battle_entity_init(struct battle_entity *);
@@ -58,6 +58,6 @@
 void
 battle_entity_finish(struct battle_entity *);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_RPG_BATTLE_ENTITY_H */
--- a/libmlk-rpg/mlk/rpg/battle-indicator.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-rpg/mlk/rpg/battle-indicator.h	Mon Feb 27 09:52:55 2023 +0100
@@ -37,7 +37,7 @@
 	struct texture tex[2];
 };
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 void
 battle_indicator_start(struct battle_indicator *);
@@ -57,6 +57,6 @@
 void
 battle_indicator_finish(struct battle_indicator *);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_RPG_BATTLE_INDICATOR_H */
--- a/libmlk-rpg/mlk/rpg/battle-message.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-rpg/mlk/rpg/battle-message.h	Mon Feb 27 09:52:55 2023 +0100
@@ -29,7 +29,7 @@
 	unsigned int elapsed;
 };
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 int
 battle_message_update(struct battle_message *, unsigned int);
@@ -37,6 +37,6 @@
 void
 battle_message_draw(const struct battle_message *);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_RPG_BATTLE_MESSAGE_H */
--- a/libmlk-rpg/mlk/rpg/battle-state.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-rpg/mlk/rpg/battle-state.h	Mon Feb 27 09:52:55 2023 +0100
@@ -36,7 +36,7 @@
 	void (*finish)(struct battle_state *, struct battle *);
 };
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 void
 battle_state_handle(struct battle_state *, struct battle *, const union mlk_event *);
@@ -50,6 +50,6 @@
 void
 battle_state_finish(struct battle_state *, struct battle *);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_RPG_BATTLE_STATE_H */
--- a/libmlk-rpg/mlk/rpg/battle.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-rpg/mlk/rpg/battle.h	Mon Feb 27 09:52:55 2023 +0100
@@ -86,7 +86,7 @@
 	struct battle_bar *bar;
 };
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 void
 battle_init(struct battle *);
@@ -148,6 +148,6 @@
 void
 battle_finish(struct battle *);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* MLK_RPG_BATTLE_H */
--- a/libmlk-rpg/mlk/rpg/character.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-rpg/mlk/rpg/character.h	Mon Feb 27 09:52:55 2023 +0100
@@ -84,7 +84,7 @@
 	void (*exec)(struct character *owner, struct battle *bt);
 };
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 int
 character_ok(const struct character *ch);
@@ -104,6 +104,6 @@
 int
 character_load(struct character *, struct save *);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_RPG_CHARACTER_H */
--- a/libmlk-rpg/mlk/rpg/equipment.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-rpg/mlk/rpg/equipment.h	Mon Feb 27 09:52:55 2023 +0100
@@ -53,7 +53,7 @@
 	void (*equip)(const struct equipment *, struct character *);
 };
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 int
 equipment_ok(const struct equipment *);
@@ -61,6 +61,6 @@
 void
 equipment_equip(const struct equipment *, struct character *);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_RPG_EQUIPMENT_H */
--- a/libmlk-rpg/mlk/rpg/inventory.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-rpg/mlk/rpg/inventory.h	Mon Feb 27 09:52:55 2023 +0100
@@ -34,7 +34,7 @@
 	struct inventory_slot items[INVENTORY_ITEM_MAX];
 };
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 int
 inventory_add(struct inventory *, const struct item *, unsigned int);
@@ -42,6 +42,6 @@
 void
 inventory_consume(struct inventory *, const struct item *, unsigned int);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_RPG_INVENTORY_H */
--- a/libmlk-rpg/mlk/rpg/item.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-rpg/mlk/rpg/item.h	Mon Feb 27 09:52:55 2023 +0100
@@ -38,7 +38,7 @@
 	                    struct character *);
 };
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 void
 item_exec_menu(const struct item *, struct character *);
@@ -49,6 +49,6 @@
                  struct character *,
                  struct character *);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_RPG_ITEM_H */
--- a/libmlk-rpg/mlk/rpg/map-file.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-rpg/mlk/rpg/map-file.h	Mon Feb 27 09:52:55 2023 +0100
@@ -40,7 +40,7 @@
 	struct mlk_alloc_pool blocks;
 };
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 int
 map_file_open(struct map_file *file, struct map *map, const char *path);
@@ -48,6 +48,6 @@
 void
 map_file_finish(struct map_file *file);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_RPG_MAP_FILE_H */
--- a/libmlk-rpg/mlk/rpg/map.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-rpg/mlk/rpg/map.h	Mon Feb 27 09:52:55 2023 +0100
@@ -98,7 +98,7 @@
 	struct map_layer layers[MAP_LAYER_TYPE_NUM];
 };
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 int
 map_init(struct map *map);
@@ -115,6 +115,6 @@
 void
 map_finish(struct map *map);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_RPG_MAP_H */
--- a/libmlk-rpg/mlk/rpg/message.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-rpg/mlk/rpg/message.h	Mon Feb 27 09:52:55 2023 +0100
@@ -63,7 +63,7 @@
 	double scale;
 };
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 void
 message_start(struct message *msg);
@@ -86,6 +86,6 @@
 void
 message_action(struct message *msg, struct mlk_action *act);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_RPG_MESSAGE_H */
--- a/libmlk-rpg/mlk/rpg/property.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-rpg/mlk/rpg/property.h	Mon Feb 27 09:52:55 2023 +0100
@@ -31,7 +31,7 @@
 	char value[PROPERTY_VALUE_MAX + 1];
 };
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 int
 property_save(const struct property *, struct save *);
@@ -42,6 +42,6 @@
 int
 property_remove(struct property *, struct save *);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_RPG_PROPERTY_H */
--- a/libmlk-rpg/mlk/rpg/quest.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-rpg/mlk/rpg/quest.h	Mon Feb 27 09:52:55 2023 +0100
@@ -38,7 +38,7 @@
 	size_t stepsz;
 };
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 int
 quest_save(struct quest *, struct save *);
@@ -46,6 +46,6 @@
 int
 quest_load(struct quest *, struct save *);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_RPG_QUEST_H */
--- a/libmlk-rpg/mlk/rpg/rpg.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-rpg/mlk/rpg/rpg.h	Mon Feb 27 09:52:55 2023 +0100
@@ -21,7 +21,7 @@
 
 #include <mlk/core/core.h>
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 int
 rpg_init(void);
@@ -29,6 +29,6 @@
 void
 rpg_finish(void);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_RPG_H */
--- a/libmlk-rpg/mlk/rpg/save.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-rpg/mlk/rpg/save.h	Mon Feb 27 09:52:55 2023 +0100
@@ -45,7 +45,7 @@
 	SAVE_STMT_ERROR
 };
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 int
 save_open(struct save *, unsigned int, enum save_mode);
@@ -82,6 +82,6 @@
 void
 save_tx_commit(struct save *);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_RPG_SAVE_H */
--- a/libmlk-rpg/mlk/rpg/selection.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-rpg/mlk/rpg/selection.h	Mon Feb 27 09:52:55 2023 +0100
@@ -47,7 +47,7 @@
 	unsigned int index_side;
 };
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 void
 selection_first(struct selection *, const struct battle *);
@@ -55,6 +55,6 @@
 void
 selection_random(struct selection *, const struct battle *);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_RPG_SELECTION_H */
--- a/libmlk-rpg/mlk/rpg/spell.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-rpg/mlk/rpg/spell.h	Mon Feb 27 09:52:55 2023 +0100
@@ -51,7 +51,7 @@
 	void (*use)(struct character *, const struct selection *);
 };
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 void
 spell_select(const struct spell *, const struct battle *, struct selection *);
@@ -62,6 +62,6 @@
 void
 spell_use(struct spell *, struct character *, const struct selection *);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_RPG_SPELL_H */
--- a/libmlk-rpg/mlk/rpg/tileset-file.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-rpg/mlk/rpg/tileset-file.h	Mon Feb 27 09:52:55 2023 +0100
@@ -36,7 +36,7 @@
 	struct sprite sprite;
 };
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 int
 tileset_file_open(struct tileset_file *, struct tileset *, const char *);
@@ -44,6 +44,6 @@
 void
 tileset_file_finish(struct tileset_file *);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_RPG_TILESET_FILE_H */
--- a/libmlk-rpg/mlk/rpg/tileset.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-rpg/mlk/rpg/tileset.h	Mon Feb 27 09:52:55 2023 +0100
@@ -46,7 +46,7 @@
 	struct sprite *sprite;
 };
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 int
 tileset_ok(const struct tileset *);
@@ -60,6 +60,6 @@
 void
 tileset_draw(const struct tileset *, unsigned int, unsigned int, int, int);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_RPG_TILESET_H */
--- a/libmlk-rpg/mlk/rpg/walksprite.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-rpg/mlk/rpg/walksprite.h	Mon Feb 27 09:52:55 2023 +0100
@@ -60,7 +60,7 @@
 	unsigned int elapsed;
 };
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 void
 walksprite_init(struct walksprite *, struct sprite *, unsigned int);
@@ -74,6 +74,6 @@
 void
 walksprite_draw(const struct walksprite *, unsigned int, int, int);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_RPG_WALKSPRITE_H */
--- a/libmlk-ui/mlk/ui/align.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-ui/mlk/ui/align.h	Mon Feb 27 09:52:55 2023 +0100
@@ -34,7 +34,7 @@
 	ALIGN_LEFT
 };
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 void
 align(enum align,
@@ -47,6 +47,6 @@
       unsigned int,
       unsigned int);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_UI_ALIGN_H */
--- a/libmlk-ui/mlk/ui/button.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-ui/mlk/ui/button.h	Mon Feb 27 09:52:55 2023 +0100
@@ -41,7 +41,7 @@
 	const struct theme *theme;
 };
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 int
 button_handle(struct button *, const union mlk_event *);
@@ -55,6 +55,6 @@
 void
 button_draw(const struct button *);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_UI_BUTTON_H */
--- a/libmlk-ui/mlk/ui/checkbox.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-ui/mlk/ui/checkbox.h	Mon Feb 27 09:52:55 2023 +0100
@@ -34,7 +34,7 @@
 	const struct theme *theme;
 };
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 void
 checkbox_draw_default(const struct theme *, const struct checkbox *);
@@ -45,6 +45,6 @@
 void
 checkbox_draw(const struct checkbox *);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_UI_CHECKBOX_H */
--- a/libmlk-ui/mlk/ui/debug.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-ui/mlk/ui/debug.h	Mon Feb 27 09:52:55 2023 +0100
@@ -37,7 +37,7 @@
 	unsigned int count;
 };
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 extern struct debug_options debug_options;
 
@@ -48,6 +48,6 @@
 void
 debugva(struct debug_report *, const char *, va_list);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_UI_DEBUG_H */
--- a/libmlk-ui/mlk/ui/frame.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-ui/mlk/ui/frame.h	Mon Feb 27 09:52:55 2023 +0100
@@ -37,7 +37,7 @@
 	const struct theme *theme;
 };
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 void
 frame_draw_default(const struct theme *, const struct frame *);
@@ -45,6 +45,6 @@
 void
 frame_draw(const struct frame *);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_UI_FRAME_H */
--- a/libmlk-ui/mlk/ui/gridmenu.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-ui/mlk/ui/gridmenu.h	Mon Feb 27 09:52:55 2023 +0100
@@ -48,7 +48,7 @@
 	unsigned int spaceh;    /* and vertically */
 };
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 void
 gridmenu_init(struct gridmenu *, unsigned int, unsigned int, const char * const *, size_t);
@@ -62,6 +62,6 @@
 void
 gridmenu_draw(const struct gridmenu *);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_UI_GRIDMENU_H */
--- a/libmlk-ui/mlk/ui/label.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-ui/mlk/ui/label.h	Mon Feb 27 09:52:55 2023 +0100
@@ -38,7 +38,7 @@
 	const struct theme *theme;
 };
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 void
 label_draw_default(const struct theme *, const struct label *);
@@ -52,6 +52,6 @@
 void
 label_draw(const struct label *);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_UI_LABEL_H */
--- a/libmlk-ui/mlk/ui/notify.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-ui/mlk/ui/notify.h	Mon Feb 27 09:52:55 2023 +0100
@@ -41,7 +41,7 @@
 	void (*draw)(const struct notify *, size_t);
 };
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 void
 notify(const struct texture *, const char *, const char *);
@@ -55,6 +55,6 @@
 void
 notify_set_system(const struct notify_system *);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /*! MLK_UI_NOTIFY_H */
--- a/libmlk-ui/mlk/ui/theme.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-ui/mlk/ui/theme.h	Mon Feb 27 09:52:55 2023 +0100
@@ -60,7 +60,7 @@
 	void (*draw_checkbox)(const struct theme *t, const struct checkbox *);
 };
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 int
 theme_init(void);
@@ -86,6 +86,6 @@
 void
 theme_finish(void);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_UI_THEME_H */
--- a/libmlk-ui/mlk/ui/ui.h	Mon Feb 27 09:46:20 2023 +0100
+++ b/libmlk-ui/mlk/ui/ui.h	Mon Feb 27 09:52:55 2023 +0100
@@ -21,7 +21,7 @@
 
 #include <mlk/core/core.h>
 
-CORE_BEGIN_DECLS
+MLK_CORE_BEGIN_DECLS
 
 int
 ui_init(void);
@@ -29,6 +29,6 @@
 void
 ui_finish(void);
 
-CORE_END_DECLS
+MLK_CORE_END_DECLS
 
 #endif /* !MLK_UI_UI_H */
--- a/tests/test-map.c	Mon Feb 27 09:46:20 2023 +0100
+++ b/tests/test-map.c	Mon Feb 27 09:52:55 2023 +0100
@@ -134,7 +134,7 @@
 	 * we will skip if it fails to initialize.
 	 */
 
-	if (core_init("fr.malikania", "test") < 0 || window_open("test-map", 100, 100) < 0)
+	if (mlk_core_init("fr.malikania", "test") < 0 || window_open("test-map", 100, 100) < 0)
 		return 1;
 
 	DT_RUN(test_basics_sample);
--- a/tests/test-tileset.c	Mon Feb 27 09:46:20 2023 +0100
+++ b/tests/test-tileset.c	Mon Feb 27 09:52:55 2023 +0100
@@ -93,7 +93,7 @@
 int
 main(void)
 {
-	if (core_init("fr.malikania", "test") < 0 || window_open("test-tileset", 100, 100) < 0)
+	if (mlk_core_init("fr.malikania", "test") < 0 || window_open("test-tileset", 100, 100) < 0)
 		return 1;
 
 	DT_RUN(test_basics_sample);