Add LM_ prefix to message_type_t enum values.
Add LM_ prefix to message_type_t enum values.
Fixes compile error on Windows because wingdi.h contains "#define ERROR 0".
diff --git a/src/lingot-gui-mainframe.c b/src/lingot-gui-mainframe.c
index 30c1b69..8380406 100644
--- a/src/lingot-gui-mainframe.c
+++ b/src/lingot-gui-mainframe.c
@@ -240,12 +240,12 @@ gboolean lingot_gui_mainframe_callback_error_dispatcher(gpointer data) {
!= NULL) ? frame->config_dialog->win : frame->win),
GTK_DIALOG_DESTROY_WITH_PARENT,
(message_type == ERROR) ? GTK_MESSAGE_ERROR
- : ((message_type == WARNING) ? GTK_MESSAGE_WARNING
+ : ((message_type == LM_WARNING) ? GTK_MESSAGE_WARNING
: GTK_MESSAGE_INFO),
GTK_BUTTONS_CLOSE, error_message);
gtk_window_set_title(GTK_WINDOW(message_dialog), (message_type
== ERROR) ? _("Error")
- : ((message_type == WARNING) ? _("Warning") : _("Info")));
+ : ((message_type == LM_WARNING) ? _("Warning") : _("Info")));
gtk_window_set_icon(GTK_WINDOW(message_dialog),
gtk_window_get_icon(GTK_WINDOW(frame->win)));
gtk_dialog_run(GTK_DIALOG(message_dialog));
diff --git a/src/lingot-msg.c b/src/lingot-msg.c
index 8cd8864..9e738d8 100644
--- a/src/lingot-msg.c
+++ b/src/lingot-msg.c
@@ -36,15 +36,15 @@ int front = 0, rear = 0;
pthread_mutex_t message_queue_mutex = PTHREAD_MUTEX_INITIALIZER;
void lingot_msg_add_error(const char* msg) {
- lingot_msg_add(msg, ERROR);
+ lingot_msg_add(msg, LM_ERROR);
}
void lingot_msg_add_warning(const char* msg) {
- lingot_msg_add(msg, WARNING);
+ lingot_msg_add(msg, LM_WARNING);
}
void lingot_msg_add_info(const char* msg) {
- lingot_msg_add(msg, INFO);
+ lingot_msg_add(msg, LM_INFO);
}
void lingot_msg_add(const char* msg, message_type_t type) {
diff --git a/src/lingot-msg.h b/src/lingot-msg.h
index 6e28964..d100683 100644
--- a/src/lingot-msg.h
+++ b/src/lingot-msg.h
@@ -27,7 +27,7 @@
// message types
typedef enum message_type_t {
- ERROR = 0, WARNING = 1, INFO = 2
+ LM_ERROR = 0, LM_WARNING = 1, LM_INFO = 2
} message_type_t;
// add messages to the queue