From 41859fc484106159bec1d785aa5014fe74e11856 Mon Sep 17 00:00:00 2001
From: Dianne Skoll <dianne@skoll.ca>
Date: Thu, 4 Jul 2024 16:58:41 -0400
Subject: [PATCH] Remove some unused definitions; use symbolic value for sort
 initializer.

---
 src/dosubst.c |  1 -
 src/globals.h |  6 +++---
 src/moon.c    | 14 --------------
 3 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/src/dosubst.c b/src/dosubst.c
index a5f246dd..b469b020 100644
--- a/src/dosubst.c
+++ b/src/dosubst.c
@@ -13,7 +13,6 @@
 
 #include "config.h"
 #include "types.h"
-#define L_IN_DOSUBST
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
diff --git a/src/globals.h b/src/globals.h
index 47699eb1..1c8e946f 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -78,9 +78,9 @@ EXTERN  INIT(   int     ExpressionEvaluationDisabled, 0);
 EXTERN  INIT(   int     ExpressionEvaluationTimeLimit, 0);
 EXTERN  INIT(   volatile sig_atomic_t ExpressionTimeLimitExceeded, 0);
 EXTERN  INIT(   int     IgnoreOnce, 0);
-EXTERN  INIT(   int     SortByTime, 0);
-EXTERN  INIT(   int     SortByDate, 0);
-EXTERN	INIT(	int	SortByPrio, 0);
+EXTERN  INIT(   int     SortByTime, SORT_NONE);
+EXTERN  INIT(   int     SortByDate, SORT_NONE);
+EXTERN	INIT(	int	SortByPrio, SORT_NONE);
 EXTERN  INIT(   int     UntimedBeforeTimed, 0);
 EXTERN	INIT(	int	DefaultPrio, NO_PRIORITY);
 EXTERN  INIT(   int     SysTime, -1);
diff --git a/src/moon.c b/src/moon.c
index 93379bef..1edc34f9 100644
--- a/src/moon.c
+++ b/src/moon.c
@@ -100,21 +100,12 @@ static double phase (double, double *, double *, double *, double *, double *, d
 #define mmlong      64.975464      /* Moon's mean lonigitude at the epoch */
 #define mmlongp     349.383063	   /* Mean longitude of the perigee at the
 				      epoch */
-#define mlnode	    151.950429	   /* Mean longitude of the node at the
-				      epoch */
-#define minc        5.145396       /* Inclination of the Moon's orbit */
 #define mecc        0.054900       /* Eccentricity of the Moon's orbit */
 #define mangsiz     0.5181         /* Moon's angular size at distance a
 				      from Earth */
 #define msmax       384401.0       /* Semi-major axis of Moon's orbit in km */
-#define mparallax   0.9507	   /* Parallax at distance a from Earth */
 #define synmonth    29.53058868    /* Synodic month (new Moon to new Moon) */
-#define lunatbase   2423436.0      /* Base date for E. W. Brown's numbered
-				      series of lunations (1923 January 16) */
 
-/*  Properties of the Earth  */
-
-#define earthrad    6378.16	   /* Radius of Earth in kilometres */
 #ifdef PI
 #undef PI
 #endif
@@ -123,11 +114,6 @@ static double phase (double, double *, double *, double *, double *, double *, d
 
 /*  Handy mathematical functions  */
 
-#ifdef sgn
-#undef sgn
-#endif
-#define sgn(x) (((x) < 0) ? -1 : ((x) > 0 ? 1 : 0))	  /* Extract sign */
-
 #ifdef abs
 #undef abs
 #endif