From a7e73cdac8771c6c88b12cb71d7f9c2a00d02ff4 Mon Sep 17 00:00:00 2001
From: Dianne Skoll <dianne@skoll.ca>
Date: Sun, 20 Mar 2022 09:44:42 -0400
Subject: [PATCH] Remove IN_DOSUBST guards.

---
 src/langs/danish.h    | 5 -----
 src/langs/dutch.h     | 4 ----
 src/langs/finnish.h   | 4 ----
 src/langs/french.h    | 5 -----
 src/langs/german.h    | 5 -----
 src/langs/icelandic.h | 5 -----
 src/langs/italian.h   | 6 ------
 src/langs/norwgian.h  | 6 ------
 src/langs/polish.h    | 5 -----
 src/langs/portbr.h    | 5 -----
 src/langs/romanian.h  | 5 -----
 src/langs/spanish.h   | 5 -----
 12 files changed, 60 deletions(-)

diff --git a/src/langs/danish.h b/src/langs/danish.h
index bb0fffa5..3e3dcfc2 100644
--- a/src/langs/danish.h
+++ b/src/langs/danish.h
@@ -48,9 +48,6 @@
 #define L_AM "am"
 #define L_PM "pm"
 
-/*** The following are only used in dosubst.c ***/
-#ifdef L_IN_DOSUBST
-
 /* Ago and from now */
 #define L_AGO "siden"
 #define L_FROMNOW "fra nu"
@@ -91,5 +88,3 @@
 #define L_I_OVER                        sprintf(s, "den %02d%c%02d", m+1, DateSep, d);
 #define L_U_OVER			L_A_OVER
 #define L_V_OVER			L_G_OVER
-
-#endif /* L_IN_DOSUBST */
diff --git a/src/langs/dutch.h b/src/langs/dutch.h
index 0749d44b..e433f85a 100644
--- a/src/langs/dutch.h
+++ b/src/langs/dutch.h
@@ -52,9 +52,6 @@
 #define L_AM "am"
 #define L_PM "pm"
 
-/*** The following are only used in dosubst.c ***/
-#ifdef L_IN_DOSUBST
-
 /* Ago and from now */
 #define L_AGO "geleden"
 #define L_FROMNOW "vanaf nu"
@@ -101,5 +98,4 @@ sprintf(s, "%d %s %s", hdiff, \
 		     (mdiff == 1 ? "minuut" : "minuten"), \
 		     when);
 
-#endif /* L_IN_DOSUBST */
 
diff --git a/src/langs/finnish.h b/src/langs/finnish.h
index 45f246d3..1cea2c17 100644
--- a/src/langs/finnish.h
+++ b/src/langs/finnish.h
@@ -52,9 +52,6 @@
 #define L_AM " ap."
 #define L_PM " ip."
 
-/*** The following are only used in dosubst.c ***/
-#ifdef L_IN_DOSUBST
-
 /* Ago and from now */
 #define L_AGO "sitten"
 #define L_FROMNOW "kuluttua"
@@ -138,7 +135,6 @@ else { \
    } \
    sprintf(s + strlen(s), when); \
 }
-#endif /* L_IN_DOSUBST */
 
 /* The next ones are used only when MK_GLOBALS is set */
 #ifdef MK_GLOBALS
diff --git a/src/langs/french.h b/src/langs/french.h
index 80bdf24c..82d6ce11 100644
--- a/src/langs/french.h
+++ b/src/langs/french.h
@@ -51,9 +51,6 @@
 #define L_AM "am"
 #define L_PM "pm"
 
-/*** The following are only used in dosubst.c ***/
-#ifdef L_IN_DOSUBST
-
 /* Ago and from now */
 #define L_AGO "il y a"
 #define L_FROMNOW "dans"
@@ -113,8 +110,6 @@ else if (tdiff < 0) { \
 
 #define L_K_OVER if (altmode == '*') { sprintf(s, "%s, %d%s %s", DayName[jul%7], d, plu, MonthName[m]); } else { sprintf(s, "%s %s, %d%s %s", L_ON, DayName[jul%7], d, plu, MonthName[m]); }
 
-#endif /* L_IN_DOSUBST */
-
 /* The next ones are used only when MK_GLOBALS is set */
 #ifdef MK_GLOBALS
 #define L_ERR_OVERRIDE 1
diff --git a/src/langs/german.h b/src/langs/german.h
index 5dd3dc63..380041f6 100644
--- a/src/langs/german.h
+++ b/src/langs/german.h
@@ -50,9 +50,6 @@
 #define L_AM "am"
 #define L_PM "pm"
 
-/*** The following are only used in dosubst.c ***/
-#ifdef L_IN_DOSUBST
-
 /* Ago and from now */
 #define L_AGO "vorher"
 #define L_FROMNOW "von heute"
@@ -88,5 +85,3 @@
 #define	L_G_OVER			if (altmode == '*') { sprintf(s, "%s, den %d. %s", DayName[jul%7], d, MonthName[m]); } else { sprintf(s, "%s %s, den %d. %s", L_ON, DayName[jul%7], d, MonthName[m]); }
 #define L_U_OVER			L_A_OVER
 #define L_V_OVER			L_G_OVER
-
-#endif /* L_IN_DOSUBST */
diff --git a/src/langs/icelandic.h b/src/langs/icelandic.h
index 720fa36a..a441875b 100644
--- a/src/langs/icelandic.h
+++ b/src/langs/icelandic.h
@@ -47,9 +47,6 @@
 #define L_AM "fh"
 #define L_PM "eh"
 
-/*** The following are only used in dosubst.c ***/
-#ifdef L_IN_DOSUBST
-
 /* Ago and from now */
 #define L_AGO "síðan"
 #define L_FROMNOW "frá því nú"
@@ -79,5 +76,3 @@
 
 /* Define any overrides here, such as L_ORDINAL_OVERRIDE, L_A_OVER, etc.
    See the file dosubst.c for more info. */
-
-#endif /* L_IN_DOSUBST */
diff --git a/src/langs/italian.h b/src/langs/italian.h
index 25055072..9ab41871 100644
--- a/src/langs/italian.h
+++ b/src/langs/italian.h
@@ -49,9 +49,6 @@
 #define L_AM "am"
 #define L_PM "pm"
 
-/*** The following are only used in dosubst.c ***/
-#ifdef L_IN_DOSUBST
-
 /* Ago and from now */
 #define L_AGO "fa"
 #define L_FROMNOW "da oggi"
@@ -114,6 +111,3 @@
 
 #define L_V_OVER	sprintf(s, "%s, %d %s", DayName[jul%7], d, \
                                 MonthName[m]);
-
-
-#endif /* L_IN_DOSUBST */
diff --git a/src/langs/norwgian.h b/src/langs/norwgian.h
index 15a09433..4f1fa7a6 100644
--- a/src/langs/norwgian.h
+++ b/src/langs/norwgian.h
@@ -47,9 +47,6 @@
 #define L_AM "am"
 #define L_PM "pm"
 
-/*** The following are only used in dosubst.c ***/
-#ifdef L_IN_DOSUBST
-
 /* Ago and from now */
 #define L_AGO "siden"
 #define L_FROMNOW "fra nå"
@@ -84,6 +81,3 @@
 #define L_G_OVER                        if (altmode == '*') { sprintf(s, "%s, den %d. %s", DayName[jul%7], d, MonthName[m]); } else { sprintf(s, "%s %s, den %d. %s", L_ON, DayName[jul%7], d, MonthName[m]); }
 #define L_U_OVER                        L_A_OVER
 #define L_V_OVER                        L_G_OVER
-
-
-#endif /* L_IN_DOSUBST */
diff --git a/src/langs/polish.h b/src/langs/polish.h
index 126c986d..60e2a814 100644
--- a/src/langs/polish.h
+++ b/src/langs/polish.h
@@ -50,9 +50,6 @@
 #define L_AM "am"
 #define L_PM "pm"
 
-/*** The following are only used in dosubst.c ***/
-#ifdef L_IN_DOSUBST
-
 /* Ago and from now */
 #define L_AGO "temu"
 #define L_FROMNOW "od teraz"
@@ -99,8 +96,6 @@ ampm = (hour<12) ? \
 #define L_U_OVER			L_A_OVER
 #define L_V_OVER			L_G_OVER
 
-#endif /* L_IN_DOSUBST */
-
 #define L_0_OVER sprintf(s, L_HPLU);
 #define L_9_OVER sprintf(s, L_MPLU);
 #define L_1_OVER \
diff --git a/src/langs/portbr.h b/src/langs/portbr.h
index 9980f99d..f1d88ac2 100644
--- a/src/langs/portbr.h
+++ b/src/langs/portbr.h
@@ -51,9 +51,6 @@
 #define L_AM "am"
 #define L_PM "pm"
 
-/*** The following are only used in dosubst.c ***/
-#ifdef L_IN_DOSUBST
-
 /* Ago and from now */
 #define L_AGO "atras"
 #define L_FROMNOW "adiante"
@@ -138,8 +135,6 @@
     } \
 }
 
-#endif /* L_IN_DOSUBST */
-
 /* The next ones are used only when MK_GLOBALS is set */
 #ifdef MK_GLOBALS
 #define L_ERR_OVERRIDE 1
diff --git a/src/langs/romanian.h b/src/langs/romanian.h
index 9bdacb25..fecc0e34 100644
--- a/src/langs/romanian.h
+++ b/src/langs/romanian.h
@@ -50,9 +50,6 @@
 #define L_AM "am"
 #define L_PM "pm"
 
-#ifdef L_IN_DOSUBST
-/*** The following are only used in dosubst.c ***/
-
 /* Ago and from now */
 #define L_AGO "acum"
 #define L_FROMNOW "peste"
@@ -104,5 +101,3 @@
             else							\
                 sprintf(s, "%s %d %s%s %s %d %s%s", when, hdiff, 	\
 			L_HOUR, hplu, L_AND, mdiff, L_MINUTE, mplu);
-
-#endif /* L_IN_DOSUBST */
diff --git a/src/langs/spanish.h b/src/langs/spanish.h
index 3be046d5..e4c69022 100644
--- a/src/langs/spanish.h
+++ b/src/langs/spanish.h
@@ -47,9 +47,6 @@
 #define L_AM "am"
 #define L_PM "pm"
 
-/*** The following are only used in dosubst.c ***/
-#ifdef L_IN_DOSUBST
-
 /* Hace y desde hoy */
 #define L_AGO "hace"
 #define L_FROMNOW "desde hoy"
@@ -74,5 +71,3 @@
 #define L_HPLU "s"  
 #define L_MPLU "s"
 
-#endif /* L_IN_DOSUBST */
-