code cleanups and fixes (new gcc and clang)

1 files changed, 5 insertions, 5 deletions

diff --git a/options.h b/options.h
index 38d6e3f..fa3db16 100644
--- a/options.h
+++ b/options.h
@@ -29,10 +29,10 @@
 #include <termios.h>
 
 enum mode_enum { MODE_MASTER, MODE_STANDBY };
-typedef enum mode_enum mode_t;
+typedef enum mode_enum switchctl_mode_t;
 
 enum channel_enum { CHAN_MAIN, CHAN_MUSIC };
-typedef enum channel_enum channel_t;
+typedef enum channel_enum switchctl_channel_t;
 
 struct options_struct {
 /* common */
@@ -48,9 +48,9 @@ struct options_struct {
   speed_t baudrate_;
 
 /* switchctl */
-  mode_t mode_;
-  channel_t channel_master_;
-  channel_t channel_standby_;
+  switchctl_mode_t mode_;
+  switchctl_channel_t channel_master_;
+  switchctl_channel_t channel_standby_;
   char* conf_file_;
   char* switch_dev_;
   key_value_storage_t alias_table_;