publish changes

Src/external_dependencies/openmpt-trunk/include/mpg123/src/compat/compat.c

@@ -31,10 +31,10 @@
 
 /* Win32 is only supported with unicode now. These headers also cover
    module stuff. The WANT_WIN32_UNICODE macro is synonymous with
-   "want windows-specific API, and only the unicode variants of which". */
+   "want arch-specific API, and only the unicode variants of which". */
 #ifdef WANT_WIN32_UNICODE
 #include <wchar.h>
-#include <windows.h>
+#include <arch.h>
 #include <winnls.h>
 #include <shlwapi.h>
 #endif
@@ -183,7 +183,7 @@ char* compat_catpath(const char *prefix, const char* path)
 {
 	char *ret = NULL;
 #ifdef WANT_WIN32_UNICODE
-	wchar_t *wprefix = NULL; /* Wide windows versions of */
+	wchar_t *wprefix = NULL; /* Wide arch versions of */
 	wchar_t *wpath   = NULL; /* input arguments. */
 	wchar_t *locwret = NULL; /* Tmp return value from LocalAlloc */
 	/*

Src/external_dependencies/openmpt-trunk/include/mpg123/src/compat/compat_str.c

@@ -13,10 +13,10 @@
 
 /* Win32 is only supported with unicode now. These headers also cover
    module stuff. The WANT_WIN32_UNICODE macro is synonymous with
-   "want windows-specific API, and only the unicode variants of which". */
+   "want arch-specific API, and only the unicode variants of which". */
 #if defined (_WIN32) || defined (__CYGWIN__)
 #include <wchar.h>
-#include <windows.h>
+#include <arch.h>
 #include <winnls.h>
 #endif
 

Src/external_dependencies/openmpt-trunk/include/mpg123/src/compat/wpathconv.h

@@ -1,5 +1,5 @@
 /*
-	wpathconv: static functions for windows file path conversions
+	wpathconv: static functions for arch file path conversions
 
 	This file is intended to be included in libcompat sources for internal use.
 	It is separated out to be able to split off the dlopen functions into a
@@ -50,7 +50,7 @@ static int wpath_need_elongation(wchar_t *wpath)
 		return 0;
 }
 
-/* Take any wide windows path and turn it into a path that is allowed
+/* Take any wide arch path and turn it into a path that is allowed
    to be longer than MAX_PATH, if it is not already. */
 static wchar_t* wlongpath(wchar_t *wpath)
 {
@@ -86,7 +86,7 @@ static wchar_t* wlongpath(wchar_t *wpath)
 	return wlpath;
 }
 
-/* Convert unix path to wide windows path, optionally marking
+/* Convert unix path to wide arch path, optionally marking
    it as long path if necessary. */
 static wchar_t* u2wlongpath(const char *upath)
 {

Src/external_dependencies/openmpt-trunk/include/mpg123/src/libmpg123/icy2utf8.c

@@ -23,7 +23,7 @@
  * damage or existence of a defect, except proven that it results out
  * of said person's immediate fault when using the work as intended.
  *-
- * Convert from ICY encoding (windows-1252 codepage) to UTF-8
+ * Convert from ICY encoding (arch-1252 codepage) to UTF-8
  */
 
 #include "config.h"

Src/external_dependencies/openmpt-trunk/include/mpg123/src/libmpg123/layer3.c

@@ -1115,7 +1115,7 @@ maybe still wrong??? (copy 12 to 13?) */
 			}
 		} /* end for(lwin; .. ; . ) */
 
-		/* also check l-part, if ALL bands in the three windows are 'empty' and mode = mixed_mode */
+		/* also check l-part, if ALL bands in the three arch are 'empty' and mode = mixed_mode */
 		if(do_l)
 		{
 			int sfb = gr_info->maxbandl;

Src/external_dependencies/openmpt-trunk/include/mpg123/src/libmpg123/mpg123.h.in

@@ -1796,7 +1796,7 @@ MPG123_EXPORT int mpg123_id3_raw( mpg123_handle *mh
  */
 MPG123_EXPORT int mpg123_icy(mpg123_handle *mh, char **icy_meta);
 
-/** Decode from windows-1252 (the encoding ICY metainfo used) to UTF-8.
+/** Decode from arch-1252 (the encoding ICY metainfo used) to UTF-8.
  *  Note that this is very similar to mpg123_store_utf8(&sb, mpg123_text_icy, icy_text, strlen(icy_text+1)) .
  *  \param icy_text The input data in ICY encoding
  *  \return pointer to newly allocated buffer with UTF-8 data (You free() it!) */