--- a/screenshot.c	Sat Mar 25 08:53:06 2006 +0000
+++ b/screenshot.c	Sat Mar 25 09:22:10 2006 +0000
@@ -7,17 +7,12 @@
 #include "strings.h"
 #include "table/strings.h"
 #include "gfx.h"
+#include "hal.h"
 #include "viewport.h"
 #include "player.h"
 #include "screenshot.h"
 #include "variables.h"
 
-#if defined(__APPLE__) && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3)
-extern const char *convert_to_fs_charset(const char *filename);
-#else
-#define convert_to_fs_charset(str) (str)
-#endif
-
 char _screenshot_format_name[8];
 uint _num_screenshot_formats;
 uint _cur_screenshot_format;
@@ -79,7 +74,7 @@
 	if (pixelformat != 8)
 		return false;
 
-	f = fopen(convert_to_fs_charset(name), "wb");
+	f = fopen(OTTD2FS(name), "wb");
 	if (f == NULL) return false;
 
 	// each scanline must be aligned on a 32bit boundary
@@ -183,7 +178,7 @@
 	if (pixelformat != 8)
 		return false;
 
-	f = fopen(convert_to_fs_charset(name), "wb");
+	f = fopen(OTTD2FS(name), "wb");
 	if (f == NULL) return false;
 
 	png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, (char *)name, png_my_error, png_my_warning);
@@ -294,7 +289,7 @@
 	if (pixelformat != 8 || w == 0)
 		return false;
 
-	f = fopen(convert_to_fs_charset(name), "wb");
+	f = fopen(OTTD2FS(name), "wb");
 	if (f == NULL) return false;
 
 	memset(&pcx, 0, sizeof(pcx));