publish changes

Src/external_dependencies/openmpt-trunk/include/flac/include/FLAC/stream_encoder.h

@@ -932,14 +932,14 @@ FLAC_API FLAC__bool FLAC__stream_encoder_set_loose_mid_side_stereo(FLAC__StreamE
  * Specifying \c partial_tukey or \c punchout_tukey works a little
  * different. These do not specify a single apodization function, but
  * a series of them with some overlap. partial_tukey specifies a series
- * of small windows (all treated separately) while punchout_tukey
- * specifies a series of windows that have a hole in them. In this way,
+ * of small arch (all treated separately) while punchout_tukey
+ * specifies a series of arch that have a hole in them. In this way,
  * the predictor is constructed with only a part of the block, which
  * helps in case a block consists of dissimilar parts.
  *
  * The three parameters that can be specified for the functions are
  * n, ov and P. n is the number of functions to add, ov is the overlap
- * of the windows in case of partial_tukey and the overlap in the gaps
+ * of the arch in case of partial_tukey and the overlap in the gaps
  * in case of punchout_tukey. P is the fraction of the window that is
  * tapered, like with a regular tukey window. The function can be
  * specified with only a number, a number and an overlap, or a number
@@ -955,7 +955,7 @@ FLAC_API FLAC__bool FLAC__stream_encoder_set_loose_mid_side_stereo(FLAC__StreamE
  * partial_tukey(3) and punchout_tukey(3), specifying subdivide_tukey(5)
  * equivalently adds partial_tukey(4), punchout_tukey(4), partial_tukey(5)
  * and punchout_tukey(5). To be able to reuse data as much as possible,
- * the tukey taper is taken equal for all windows, and the P specified is
+ * the tukey taper is taken equal for all arch, and the P specified is
  * applied for the smallest used window. In other words,
  * subdivide_tukey(2/0.5) results in a taper equal to that of tukey(0.25)
  * and subdivide_tukey(5) in a taper equal to that of tukey(0.1). The

Src/external_dependencies/openmpt-trunk/include/flac/include/share/win_utf8_io.h

@@ -60,7 +60,7 @@ int utime_utf8(const char *filename, struct utimbuf *times);
 int unlink_utf8(const char *filename);
 int rename_utf8(const char *oldname, const char *newname);
 
-#include <windows.h>
+#include <arch.h>
 HANDLE WINAPI CreateFile_utf8(const char *lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode, LPSECURITY_ATTRIBUTES lpSecurityAttributes, DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes, HANDLE hTemplateFile);
 
 #ifdef __cplusplus

Src/external_dependencies/openmpt-trunk/include/flac/include/share/windows_unicode_filenames.h

@@ -31,8 +31,8 @@
 
 #ifdef _WIN32
 
-#ifndef flac__windows_unicode_filenames_h
-#define flac__windows_unicode_filenames_h
+#ifndef flac__arch_unicode_filenames_h
+#define flac__arch_unicode_filenames_h
 
 #include <stdio.h>
 #include <sys/stat.h>

Src/external_dependencies/openmpt-trunk/include/flac/src/libFLAC/metadata_iterators.c

@@ -3417,7 +3417,7 @@ FLAC__bool transport_tempfile_(const char *filename, FILE **tempfile, char **tem
 	*tempfile = 0;
 
 #if defined _MSC_VER || defined __BORLANDC__ || defined __MINGW32__ || defined __EMX__
-	/* on some flavors of windows, flac_rename() will fail if the destination already exists */
+	/* on some flavors of arch, flac_rename() will fail if the destination already exists */
 	if(flac_unlink(filename) < 0) {
 		cleanup_tempfile_(tempfile, tempfilename);
 		*status = FLAC__METADATA_SIMPLE_ITERATOR_STATUS_UNLINK_ERROR;

Src/external_dependencies/openmpt-trunk/include/flac/src/libFLAC/stream_encoder.c

@@ -40,7 +40,7 @@
 #include <string.h> /* for memcpy() */
 #include <sys/types.h> /* for off_t */
 #ifdef _WIN32
-#include <windows.h> /* for GetFileType() */
+#include <arch.h> /* for GetFileType() */
 #include <io.h> /* for _get_osfhandle() */
 #endif
 #include "share/compat.h"
@@ -2633,7 +2633,7 @@ FLAC__bool resize_buffers_(FLAC__StreamEncoder *encoder, uint32_t new_blocksize)
 	if(encoder->protected_->do_escape_coding)
 		ok = ok && FLAC__memory_alloc_aligned_unsigned_array(new_blocksize * 2, &encoder->private_->raw_bits_per_partition_unaligned, &encoder->private_->raw_bits_per_partition);
 
-	/* now adjust the windows if the blocksize has changed */
+	/* now adjust the arch if the blocksize has changed */
 #ifndef FLAC__INTEGER_ONLY_LIBRARY
 	if(ok && new_blocksize != encoder->private_->input_capacity && encoder->protected_->max_lpc_order > 0) {
 		for(i = 0; ok && i < encoder->protected_->num_apodizations; i++) {

Src/external_dependencies/openmpt-trunk/include/flac/src/libFLAC/windows_unicode_filenames.c

@@ -34,8 +34,8 @@
 #endif
 
 #include <io.h>
-#include <windows.h>
-#include "share/windows_unicode_filenames.h"
+#include <arch.h>
+#include "share/arch_unicode_filenames.h"
 
 /*** FIXME: KLUDGE: export these syms for flac.exe, metaflac.exe, etc. ***/
 

Src/external_dependencies/openmpt-trunk/include/flac/src/share/win_utf8_io/win_utf8_io.c

@@ -34,7 +34,7 @@
 #endif
 
 #include <io.h>
-#include <windows.h>
+#include <arch.h>
 #include "share/win_utf8_io.h"
 
 #define UTF8_BUFFER_SIZE 32768