Add LOG_ prefix to enum entries to avoid name collisions.

Author: Logikable

kernel/log.cc

@@ -160,7 +160,7 @@ void logv(LogSeverity severity, const char *format, va_list ap)
 		for (auto f : log_streams)
 			*f << time_str;
 
-    if (severity >= LogSeverity::WARNING)
+    if (severity >= LogSeverity::LOG_WARNING)
       for (auto f : log_warning_streams)
         *f << time_str;
 	}
@@ -171,7 +171,7 @@ void logv(LogSeverity severity, const char *format, va_list ap)
 	for (auto f : log_streams)
 		*f << str;
 
-  if (severity >= LogSeverity::WARNING)
+  if (severity >= LogSeverity::LOG_WARNING)
     for (auto f : log_warning_streams) {
       *f << str;
       f->flush();
@@ -233,7 +233,7 @@ void logv_header(RTLIL::Design *design, const char *format, va_list ap)
 		header_id += stringf("%s%d", header_id.empty() ? "" : ".", c);
 
 	log("%s. ", header_id.c_str());
-	logv(LogSeverity::INFO, format, ap);
+	logv(LogSeverity::LOG_INFO, format, ap);
 	log_flush();
 
 	if (log_hdump_all)
@@ -299,7 +299,7 @@ static void logv_warning_with_prefix(const char *prefix,
 			if (log_errfile != NULL && !log_quiet_warnings)
 				log_files.push_back(log_errfile);
 
-			log(LogSeverity::WARNING, "%s%s", prefix, message.c_str());
+			log(LogSeverity::LOG_WARNING, "%s%s", prefix, message.c_str());
 			log_flush();
 
 			if (log_errfile != NULL && !log_quiet_warnings)
@@ -343,7 +343,7 @@ void log_file_info(const std::string &filename, int lineno,
 	va_start(ap, format);
 	std::string fmt = stringf("%s:%d: Info: %s",
 			filename.c_str(), lineno, format);
-	logv(LogSeverity::INFO, fmt.c_str(), ap);
+	logv(LogSeverity::LOG_INFO, fmt.c_str(), ap);
 	va_end(ap);
 }
 
@@ -367,7 +367,7 @@ static void logv_error_with_prefix(const char *prefix,
 				f = stderr;
 
 	log_last_error = vstringf(format, ap);
-	log(LogSeverity::ERROR, "%s%s", prefix, log_last_error.c_str());
+	log(LogSeverity::LOG_ERROR, "%s%s", prefix, log_last_error.c_str());
 	log_flush();
 
 	log_make_debug = bak_log_make_debug;
@@ -425,7 +425,7 @@ void log(const char *format, ...)
 {
 	va_list ap;
 	va_start(ap, format);
-	logv(LogSeverity::INFO, format, ap);
+	logv(LogSeverity::LOG_INFO, format, ap);
 	va_end(ap);
 }
 
@@ -497,7 +497,7 @@ void log_cmd_error(const char *format, ...)
 			pop_errfile = true;
 		}
 
-		log(LogSeverity::ERROR, "ERROR: %s", log_last_error.c_str());
+		log(LogSeverity::LOG_ERROR, "ERROR: %s", log_last_error.c_str());
 		log_flush();
 
 		if (pop_errfile)

kernel/log.h

@@ -95,9 +95,9 @@ YOSYS_NAMESPACE_BEGIN
 struct log_cmd_error_exception { };
 
 enum LogSeverity {
-  INFO,
-  WARNING,
-  ERROR
+  LOG_INFO,
+  LOG_WARNING,
+  LOG_ERROR
 };
 
 extern std::vector<FILE*> log_files;