From 764a723704b26582e8a98bc8c5cf97c268707bbb Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Sun, 19 Apr 2020 16:43:10 -0700 Subject: [PATCH] ircd: Rename formerly conflicting header files. --- include/ircd/ircd.h | 6 +++--- include/ircd/{localee.h => locale.h} | 0 include/ircd/{magics.h => magic.h} | 0 include/ircd/{timedate.h => time.h} | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename include/ircd/{localee.h => locale.h} (100%) rename include/ircd/{magics.h => magic.h} (100%) rename include/ircd/{timedate.h => time.h} (100%) diff --git a/include/ircd/ircd.h b/include/ircd/ircd.h index b55891238..0f256a60d 100644 --- a/include/ircd/ircd.h +++ b/include/ircd/ircd.h @@ -52,8 +52,8 @@ #include "run.h" #include "demangle.h" #include "backtrace.h" -#include "localee.h" -#include "timedate.h" +#include "locale.h" +#include "time.h" #include "logger.h" #include "info.h" #include "nacl.h" @@ -80,7 +80,7 @@ #include "fmt.h" #include "http.h" #include "http2/http2.h" -#include "magics.h" +#include "magic.h" #include "conf.h" #include "stats.h" #include "prof/prof.h" diff --git a/include/ircd/localee.h b/include/ircd/locale.h similarity index 100% rename from include/ircd/localee.h rename to include/ircd/locale.h diff --git a/include/ircd/magics.h b/include/ircd/magic.h similarity index 100% rename from include/ircd/magics.h rename to include/ircd/magic.h diff --git a/include/ircd/timedate.h b/include/ircd/time.h similarity index 100% rename from include/ircd/timedate.h rename to include/ircd/time.h