'gtk2_ardour' - Harmonize '__WIN32__', 'OS_WIN32' etc, etc. Use 'PLATFORM_WINDOWS' instead

gtk2_ardour/editor_timefx.cc

@@ -402,7 +402,7 @@ Editor::timefx_thread (void *arg)
            by the GUI ...
         */
 
-#ifdef WIN32
+#ifdef PLATFORM_WINDOWS
 	Sleep(2000);
 #else
         struct timespec t = { 2, 0 };

gtk2_ardour/export_video_dialog.cc

@@ -688,7 +688,7 @@ ExportVideoDialog::encode_pass (int pass)
 		ffs["-an"] = "-y";
 		ffs["-passlogfile"] =  Glib::path_get_dirname (outfn) + G_DIR_SEPARATOR + "ffmpeg2pass";
 		ffs["-f"] = get_file_extension(invid).empty()?"mov":get_file_extension(invid);
-#ifdef _OS_WIN32
+#ifdef PLATFORM_WINDOWS
 		outfn = "NUL";
 #else
 		outfn = "/dev/null";

gtk2_ardour/main.cc

@@ -506,7 +506,7 @@ int main (int argc, char *argv[])
 		return curvetest (curvetest_file);
 	}
 
-#ifndef WIN32
+#ifndef PLATFORM_WINDOWS
 	if (::signal (SIGPIPE, sigpipe_handler)) {
 		cerr << _("Cannot xinstall SIGPIPE error handler") << endl;
 	}

gtk2_ardour/pingback.cc

@@ -23,7 +23,7 @@
 #include <fstream>
 #include <cstring>
 
-#ifndef WIN32
+#ifndef PLATFORM_WINDOWS
 #include <sys/utsname.h>
 #endif
 
@@ -73,7 +73,7 @@ struct ping_call {
 static void*
 _pingback (void *arg)
 {
-#ifndef WIN32
+#ifndef PLATFORM_WINDOWS
 	ping_call* cm = static_cast<ping_call*> (arg);
 	CURL* c;
 	struct utsname utb;
@@ -162,7 +162,7 @@ _pingback (void *arg)
 	curl_easy_cleanup (c);
 	delete cm;
 
-#endif /* WIN32 */
+#endif /* PLATFORM_WINDOWS */
 
 	return 0;
 }

gtk2_ardour/sfdb_freesound_mootcher.cc

@@ -91,7 +91,7 @@ void Mootcher::ensureWorkingDir ()
 		}
 	}
 	basePath = p;
-#ifdef __WIN32__
+#ifdef PLATFORM_WINDOWS
 	std::string replace = "/";
 	size_t pos = basePath.find("\\");
 	while( pos != std::string::npos ){

gtk2_ardour/sfdb_ui.cc

@@ -1459,7 +1459,7 @@ SoundFileOmega::check_info (const vector<string>& paths, bool& same_size, bool&
 bool
 SoundFileOmega::check_link_status (const Session* s, const vector<string>& paths)
 {
-#ifdef WIN32
+#ifdef PLATFORM_WINDOWS
 	return false;
 #else
 	std::string tmpdir(Glib::build_filename (s->session_directory().sound_path(), "linktest"));

gtk2_ardour/system_exec.cc

@@ -27,7 +27,7 @@
 #include <assert.h>
 #include <dirent.h>
 
-#ifdef __WIN32__
+#ifdef PLATFORM_WINDOWS
 #include <windows.h>
 #else
 #include <fcntl.h>
@@ -47,7 +47,7 @@ void * interposer_thread (void *arg);
 
 static void close_fd (int& fd) { if (fd >= 0) ::close (fd); fd = -1; }
 
-#ifndef __WIN32__
+#ifndef PLATFORM_WINDOWS
 /*
  * This function was part of libasyncns.
  * LGPL v2.1
@@ -155,7 +155,7 @@ SystemExec::SystemExec (std::string c, std::string a)
 	nicelevel = 0;
 	envp = NULL;
 	argp = NULL;
-#ifdef __WIN32__
+#ifdef PLATFORM_WINDOWS
 	stdinP[0] = stdinP[1] = INVALID_HANDLE_VALUE;
 	stdoutP[0] = stdoutP[1] = INVALID_HANDLE_VALUE;
 	stderrP[0] = stderrP[1] = INVALID_HANDLE_VALUE;
@@ -173,7 +173,7 @@ SystemExec::SystemExec (std::string c, char **a)
 	pin[1] = -1;
 	nicelevel = 0;
 	envp = NULL;
-#ifdef __WIN32__
+#ifdef PLATFORM_WINDOWS
 	stdinP[0] = stdinP[1] = INVALID_HANDLE_VALUE;
 	stdoutP[0] = stdoutP[1] = INVALID_HANDLE_VALUE;
 	stderrP[0] = stderrP[1] = INVALID_HANDLE_VALUE;
@@ -197,7 +197,7 @@ SystemExec::~SystemExec ()
 		}
 		free (argp);
 	}
-#ifdef __WIN32__
+#ifdef PLATFORM_WINDOWS
 	if (w_args) free(w_args);
 #endif
 	pthread_mutex_destroy(&write_lock);
@@ -211,7 +211,7 @@ interposer_thread (void *arg) {
 	return 0;
 }
 
-#ifdef __WIN32__ /* Windows Process */
+#ifdef PLATFORM_WINDOWS /* Windows Process */
 
 /* HELPER FUNCTIONS */
 

gtk2_ardour/system_exec.h

@@ -177,7 +177,7 @@ class SystemExec
 		char **envp;
 
 	private:
-#ifdef __WIN32__
+#ifdef PLATFORM_WINDOWS
 		PROCESS_INFORMATION *pid;
 		HANDLE stdinP[2];
 		HANDLE stdoutP[2];

gtk2_ardour/transcode_ffmpeg.cc

@@ -505,7 +505,7 @@ TranscodeFfmpeg::cancel ()
 {
 	if (!ffcmd || !ffcmd->is_running()) { return;}
 	ffcmd->write_to_stdin("q");
-#ifdef WIN32
+#ifdef PLATFORM_WINDOWS
 	Sleep(1000);
 #else
 	sleep (1);

gtk2_ardour/utils.cc

@@ -741,7 +741,7 @@ set_pango_fontsize ()
 
 	/* FT2 rendering - used by GnomeCanvas, sigh */
 
-#ifndef WIN32
+#ifndef PLATFORM_WINDOWS
 	pango_ft2_font_map_set_resolution ((PangoFT2FontMap*) pango_ft2_font_map_new(), val/1024, val/1024);
 #endif