From 5a72365e37c1d4dad8030351b0b508e0bcfe0efc Mon Sep 17 00:00:00 2001 From: Jonathan Wilkes <jon.w.wilkes@gmail.com> Date: Sat, 23 May 2020 23:22:29 -0400 Subject: [PATCH] more fixes for multiply defined global variables --- externals/iem/iem_adaptfilt/src/iemlib.h | 4 ++-- externals/iem/iem_ambi/src/iemlib.h | 4 ++-- externals/iem/iem_atan2/src/iemlib.h | 4 ++-- externals/iem/iem_bin_ambi/src/iemlib.h | 4 ++-- externals/iem/iem_delay/src/iemlib.h | 4 ++-- externals/iem/iem_matrix/src/iemlib.h | 4 ++-- externals/iem/iem_roomsim/src/iemlib.h | 4 ++-- externals/iem/iem_spec2/src/iemlib.h | 4 ++-- externals/iem/iem_tab/src/iemlib.h | 4 ++-- externals/iem/iemgui/src/iemlib.h | 4 ++-- externals/iemlib/include/iemlib.h | 4 ++-- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/externals/iem/iem_adaptfilt/src/iemlib.h b/externals/iem/iem_adaptfilt/src/iemlib.h index 97b088bab..9bf866b1d 100644 --- a/externals/iem/iem_adaptfilt/src/iemlib.h +++ b/externals/iem/iem_adaptfilt/src/iemlib.h @@ -22,11 +22,11 @@ iemlib written by Thomas Musil, Copyright (c) IEM KUG Graz Austria 2000 - 2009 * */ #ifdef MSW -int sys_noloadbang; +//int sys_noloadbang; //t_symbol *iemgui_key_sym=0; #include <io.h> #else -extern int sys_noloadbang; +//extern int sys_noloadbang; //extern t_symbol *iemgui_key_sym; #include <unistd.h> #endif diff --git a/externals/iem/iem_ambi/src/iemlib.h b/externals/iem/iem_ambi/src/iemlib.h index 97b088bab..9bf866b1d 100644 --- a/externals/iem/iem_ambi/src/iemlib.h +++ b/externals/iem/iem_ambi/src/iemlib.h @@ -22,11 +22,11 @@ iemlib written by Thomas Musil, Copyright (c) IEM KUG Graz Austria 2000 - 2009 * */ #ifdef MSW -int sys_noloadbang; +//int sys_noloadbang; //t_symbol *iemgui_key_sym=0; #include <io.h> #else -extern int sys_noloadbang; +//extern int sys_noloadbang; //extern t_symbol *iemgui_key_sym; #include <unistd.h> #endif diff --git a/externals/iem/iem_atan2/src/iemlib.h b/externals/iem/iem_atan2/src/iemlib.h index 97b088bab..9bf866b1d 100644 --- a/externals/iem/iem_atan2/src/iemlib.h +++ b/externals/iem/iem_atan2/src/iemlib.h @@ -22,11 +22,11 @@ iemlib written by Thomas Musil, Copyright (c) IEM KUG Graz Austria 2000 - 2009 * */ #ifdef MSW -int sys_noloadbang; +//int sys_noloadbang; //t_symbol *iemgui_key_sym=0; #include <io.h> #else -extern int sys_noloadbang; +//extern int sys_noloadbang; //extern t_symbol *iemgui_key_sym; #include <unistd.h> #endif diff --git a/externals/iem/iem_bin_ambi/src/iemlib.h b/externals/iem/iem_bin_ambi/src/iemlib.h index 97b088bab..9bf866b1d 100644 --- a/externals/iem/iem_bin_ambi/src/iemlib.h +++ b/externals/iem/iem_bin_ambi/src/iemlib.h @@ -22,11 +22,11 @@ iemlib written by Thomas Musil, Copyright (c) IEM KUG Graz Austria 2000 - 2009 * */ #ifdef MSW -int sys_noloadbang; +//int sys_noloadbang; //t_symbol *iemgui_key_sym=0; #include <io.h> #else -extern int sys_noloadbang; +//extern int sys_noloadbang; //extern t_symbol *iemgui_key_sym; #include <unistd.h> #endif diff --git a/externals/iem/iem_delay/src/iemlib.h b/externals/iem/iem_delay/src/iemlib.h index 97b088bab..9bf866b1d 100644 --- a/externals/iem/iem_delay/src/iemlib.h +++ b/externals/iem/iem_delay/src/iemlib.h @@ -22,11 +22,11 @@ iemlib written by Thomas Musil, Copyright (c) IEM KUG Graz Austria 2000 - 2009 * */ #ifdef MSW -int sys_noloadbang; +//int sys_noloadbang; //t_symbol *iemgui_key_sym=0; #include <io.h> #else -extern int sys_noloadbang; +//extern int sys_noloadbang; //extern t_symbol *iemgui_key_sym; #include <unistd.h> #endif diff --git a/externals/iem/iem_matrix/src/iemlib.h b/externals/iem/iem_matrix/src/iemlib.h index 97b088bab..9bf866b1d 100644 --- a/externals/iem/iem_matrix/src/iemlib.h +++ b/externals/iem/iem_matrix/src/iemlib.h @@ -22,11 +22,11 @@ iemlib written by Thomas Musil, Copyright (c) IEM KUG Graz Austria 2000 - 2009 * */ #ifdef MSW -int sys_noloadbang; +//int sys_noloadbang; //t_symbol *iemgui_key_sym=0; #include <io.h> #else -extern int sys_noloadbang; +//extern int sys_noloadbang; //extern t_symbol *iemgui_key_sym; #include <unistd.h> #endif diff --git a/externals/iem/iem_roomsim/src/iemlib.h b/externals/iem/iem_roomsim/src/iemlib.h index 97b088bab..9bf866b1d 100644 --- a/externals/iem/iem_roomsim/src/iemlib.h +++ b/externals/iem/iem_roomsim/src/iemlib.h @@ -22,11 +22,11 @@ iemlib written by Thomas Musil, Copyright (c) IEM KUG Graz Austria 2000 - 2009 * */ #ifdef MSW -int sys_noloadbang; +//int sys_noloadbang; //t_symbol *iemgui_key_sym=0; #include <io.h> #else -extern int sys_noloadbang; +//extern int sys_noloadbang; //extern t_symbol *iemgui_key_sym; #include <unistd.h> #endif diff --git a/externals/iem/iem_spec2/src/iemlib.h b/externals/iem/iem_spec2/src/iemlib.h index ac1ffced3..380213227 100644 --- a/externals/iem/iem_spec2/src/iemlib.h +++ b/externals/iem/iem_spec2/src/iemlib.h @@ -25,11 +25,11 @@ iemlib written by Thomas Musil, Copyright (c) IEM KUG Graz Austria 2000 - 2012 * */ #ifdef MSW -int sys_noloadbang; +//int sys_noloadbang; //t_symbol *iemgui_key_sym=0; #include <io.h> #else -extern int sys_noloadbang; +//extern int sys_noloadbang; //extern t_symbol *iemgui_key_sym; #include <unistd.h> #endif diff --git a/externals/iem/iem_tab/src/iemlib.h b/externals/iem/iem_tab/src/iemlib.h index ac1ffced3..380213227 100644 --- a/externals/iem/iem_tab/src/iemlib.h +++ b/externals/iem/iem_tab/src/iemlib.h @@ -25,11 +25,11 @@ iemlib written by Thomas Musil, Copyright (c) IEM KUG Graz Austria 2000 - 2012 * */ #ifdef MSW -int sys_noloadbang; +//int sys_noloadbang; //t_symbol *iemgui_key_sym=0; #include <io.h> #else -extern int sys_noloadbang; +//extern int sys_noloadbang; //extern t_symbol *iemgui_key_sym; #include <unistd.h> #endif diff --git a/externals/iem/iemgui/src/iemlib.h b/externals/iem/iemgui/src/iemlib.h index 97b088bab..9bf866b1d 100644 --- a/externals/iem/iemgui/src/iemlib.h +++ b/externals/iem/iemgui/src/iemlib.h @@ -22,11 +22,11 @@ iemlib written by Thomas Musil, Copyright (c) IEM KUG Graz Austria 2000 - 2009 * */ #ifdef MSW -int sys_noloadbang; +//int sys_noloadbang; //t_symbol *iemgui_key_sym=0; #include <io.h> #else -extern int sys_noloadbang; +//extern int sys_noloadbang; //extern t_symbol *iemgui_key_sym; #include <unistd.h> #endif diff --git a/externals/iemlib/include/iemlib.h b/externals/iemlib/include/iemlib.h index ac1ffced3..380213227 100644 --- a/externals/iemlib/include/iemlib.h +++ b/externals/iemlib/include/iemlib.h @@ -25,11 +25,11 @@ iemlib written by Thomas Musil, Copyright (c) IEM KUG Graz Austria 2000 - 2012 * */ #ifdef MSW -int sys_noloadbang; +//int sys_noloadbang; //t_symbol *iemgui_key_sym=0; #include <io.h> #else -extern int sys_noloadbang; +//extern int sys_noloadbang; //extern t_symbol *iemgui_key_sym; #include <unistd.h> #endif -- GitLab