From 9074ebec702da4a816ed5c227b2ea53a70ec3d1c Mon Sep 17 00:00:00 2001
From: Amar Takhar <verm@aegisub.org>
Date: Sun, 12 Jul 2009 20:10:25 +0000
Subject: [PATCH] * BUILD_DARWIN was a define used for libass only, change it
to __APPLE__ (sigh) * char config_path -> const char *config_path for
non-MAC builds. not sure how the first version got in.
Originally committed to SVN as r3107.
---
aegisub/src/subtitles_provider_libass.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/aegisub/src/subtitles_provider_libass.cpp b/aegisub/src/subtitles_provider_libass.cpp
index 4f5df4f63..4ac803a9c 100644
--- a/aegisub/src/subtitles_provider_libass.cpp
+++ b/aegisub/src/subtitles_provider_libass.cpp
@@ -47,7 +47,7 @@
#include "standard_paths.h"
#include <wx/filefn.h>
-#ifdef BUILD_DARWIN
+#ifdef __APPLE__
#include "libosxutil/libosxutil.h"
#include <sys/param.h>
#endif
@@ -79,7 +79,7 @@ LibassSubtitlesProvider::LibassSubtitlesProvider() {
if (!ass_renderer) throw _T("ass_renderer_init failed");
ass_set_font_scale(ass_renderer, 1.);
-#ifdef BUILD_DARWIN
+#ifdef __APPLE__
char config_path[MAXPATHLEN];
char *config_dir;
@@ -87,7 +87,7 @@ LibassSubtitlesProvider::LibassSubtitlesProvider() {
snprintf(config_path, MAXPATHLEN, "%s/etc/fonts/fonts.conf", config_dir);
free(config_dir);
#else
- char config_path = NULL;
+ const char *config_path = NULL;
#endif
ass_set_fonts(ass_renderer, NULL, "Sans", 1, config_path);
--
GitLab