Reformatted some source files; did a test compilation for every language.

This commit is contained in:
dfs
1996-04-29 19:34:36 +00:00
parent 46dddf591c
commit d6d06dc096
7 changed files with 170 additions and 170 deletions

View File

@@ -1,5 +1,5 @@
# Makefile for REMIND
# $Id: Makefile,v 1.4 1996-04-28 02:01:51 dfs Exp $
# $Id: Makefile,v 1.5 1996-04-29 19:34:36 dfs Exp $
#-----------------------------------------------------------------------------
# THINGS FOR YOU TO EDIT START BELOW
@@ -80,8 +80,8 @@ makefile.os2 makefile.tc moon.c norwgian.h omit.c os2func.c polish.h \
protos.h queue.c rem rem.1 rem2ps.1 rem2ps.c rem2ps.h remind-all.csh \
remind-all.sh remind.1 remind.def smakefile sort.c test-rem \
test-rem.ami test-rem.bat test-rem.cmd test-rem.rexx test.cmp test.rem \
test1.cmp test2.cmp token.c trigger.c tstlang.rem types.h userfns.c \
utils.c var.c version.h
test1.cmp test2.cmp tkremind tkremind.1 token.c trigger.c tstlang.rem \
types.h userfns.c utils.c var.c version.h
OBJS= $(SRCS:.c=.o)
@@ -135,7 +135,7 @@ shar:
shar -x -n"Remind $(VERSION)" -l45 -o./Shar $(MANIFEST)
backup:
cp $(MANIFEST) ../backup
tar cvzf ../rbackup.tgz $(MANIFEST)
transmit:
sz -a -e $(MANIFEST)

136
dosubst.c
View File

@@ -10,7 +10,7 @@
/* */
/***************************************************************/
static char const RCSID[] = "$Id: dosubst.c,v 1.1 1996-03-27 03:25:52 dfs Exp $";
static char const RCSID[] = "$Id: dosubst.c,v 1.2 1996-04-29 19:34:36 dfs Exp $";
#define L_IN_DOSUBST
#include "config.h"
@@ -88,7 +88,7 @@ int jul, mode;
#ifdef L_AMPM_OVERRIDE
L_AMPM_OVERRIDE (pm, h)
#else
pm = (h < 12) ? L_AM : L_PM;
pm = (h < 12) ? L_AM : L_PM;
#endif
hh = (h == 12) ? 12 : h % 12;
@@ -98,26 +98,26 @@ int jul, mode;
#ifdef L_AMPM_OVERRIDE
L_AMPM_OVERRIDE (cpm, ch)
#else
cpm = (ch < 12) ? L_AM : L_PM;
cpm = (ch < 12) ? L_AM : L_PM;
#endif
chh = (ch == 12) ? 12 : ch % 12;
#ifdef L_ORDINAL_OVERRIDE
L_ORDINAL_OVERRIDE
#else
switch(d) {
case 1:
case 21:
case 31: plu = "st"; break;
switch(d) {
case 1:
case 21:
case 31: plu = "st"; break;
case 2:
case 22: plu = "nd"; break;
case 2:
case 22: plu = "nd"; break;
case 3:
case 23: plu = "rd"; break;
case 3:
case 23: plu = "rd"; break;
default: plu = "th"; break;
}
default: plu = "th"; break;
}
#endif
while(1) {
@@ -197,8 +197,8 @@ int jul, mode;
#ifdef L_A_OVER
L_A_OVER
#else
sprintf(s, "%s %s, %d %s, %d", L_ON, DayName[jul%7], d,
MonthName[m], y);
sprintf(s, "%s %s, %d %s, %d", L_ON, DayName[jul%7], d,
MonthName[m], y);
#endif
s += strlen(s);
break;
@@ -207,7 +207,7 @@ int jul, mode;
#ifdef L_B_OVER
L_B_OVER
#else
sprintf(s, L_INXDAYS, diff);
sprintf(s, L_INXDAYS, diff);
#endif
s += strlen(s);
break;
@@ -216,7 +216,7 @@ int jul, mode;
#ifdef L_C_OVER
L_C_OVER
#else
sprintf(s, "%s %s", L_ON, DayName[jul%7]);
sprintf(s, "%s %s", L_ON, DayName[jul%7]);
#endif
s += strlen(s);
break;
@@ -225,7 +225,7 @@ int jul, mode;
#ifdef L_D_OVER
L_D_OVER
#else
sprintf(s, "%d", d);
sprintf(s, "%d", d);
#endif
s += strlen(s);
break;
@@ -234,8 +234,8 @@ int jul, mode;
#ifdef L_E_OVER
L_E_OVER
#else
sprintf(s, "%s %02d%c%02d%c%04d", L_ON, d, DATESEP,
m+1, DATESEP, y);
sprintf(s, "%s %02d%c%02d%c%04d", L_ON, d, DATESEP,
m+1, DATESEP, y);
#endif
s += strlen(s);
break;
@@ -244,7 +244,7 @@ int jul, mode;
#ifdef L_F_OVER
L_F_OVER
#else
sprintf(s, "%s %02d%c%02d%c%04d", L_ON, m+1, DATESEP, d, DATESEP, y);
sprintf(s, "%s %02d%c%02d%c%04d", L_ON, m+1, DATESEP, d, DATESEP, y);
#endif
s += strlen(s);
break;
@@ -253,7 +253,7 @@ int jul, mode;
#ifdef L_G_OVER
L_G_OVER
#else
sprintf(s, "%s %s, %d %s", L_ON, DayName[jul%7], d, MonthName[m]);
sprintf(s, "%s %s, %d %s", L_ON, DayName[jul%7], d, MonthName[m]);
#endif
s += strlen(s);
break;
@@ -262,7 +262,7 @@ int jul, mode;
#ifdef L_H_OVER
L_H_OVER
#else
sprintf(s, "%s %02d%c%02d", L_ON, d, DATESEP, m+1);
sprintf(s, "%s %02d%c%02d", L_ON, d, DATESEP, m+1);
#endif
s += strlen(s);
break;
@@ -271,7 +271,7 @@ int jul, mode;
#ifdef L_I_OVER
L_I_OVER
#else
sprintf(s, "%s %02d%c%02d", L_ON, m+1, DATESEP, d);
sprintf(s, "%s %02d%c%02d", L_ON, m+1, DATESEP, d);
#endif
s += strlen(s);
break;
@@ -280,8 +280,8 @@ int jul, mode;
#ifdef L_J_OVER
L_J_OVER
#else
sprintf(s, "%s %s, %s %d%s, %d", L_ON, DayName[jul%7],
MonthName[m], d, plu, y);
sprintf(s, "%s %s, %s %d%s, %d", L_ON, DayName[jul%7],
MonthName[m], d, plu, y);
#endif
s += strlen(s);
break;
@@ -290,8 +290,8 @@ int jul, mode;
#ifdef L_K_OVER
L_K_OVER
#else
sprintf(s, "%s %s, %s %d%s", L_ON, DayName[jul%7],
MonthName[m], d, plu);
sprintf(s, "%s %s, %s %d%s", L_ON, DayName[jul%7],
MonthName[m], d, plu);
#endif
s += strlen(s);
break;
@@ -300,7 +300,7 @@ int jul, mode;
#ifdef L_L_OVER
L_L_OVER
#else
sprintf(s, "%s %04d%c%02d%c%02d", L_ON, y, DATESEP, m+1, DATESEP, d);
sprintf(s, "%s %04d%c%02d%c%02d", L_ON, y, DATESEP, m+1, DATESEP, d);
#endif
s += strlen(s);
break;
@@ -309,7 +309,7 @@ int jul, mode;
#ifdef L_M_OVER
L_M_OVER
#else
sprintf(s, "%s", MonthName[m]);
sprintf(s, "%s", MonthName[m]);
#endif
s += strlen(s);
break;
@@ -318,7 +318,7 @@ int jul, mode;
#ifdef L_N_OVER
L_N_OVER
#else
sprintf(s, "%d", m+1);
sprintf(s, "%d", m+1);
#endif
s += strlen(s);
break;
@@ -327,8 +327,8 @@ int jul, mode;
#ifdef L_O_OVER
L_O_OVER
#else
if (RealToday == JulianToday) sprintf(s, " (%s)", L_TODAY);
else *s = 0;
if (RealToday == JulianToday) sprintf(s, " (%s)", L_TODAY);
else *s = 0;
#endif
s += strlen(s);
break;
@@ -337,7 +337,7 @@ int jul, mode;
#ifdef L_P_OVER
L_P_OVER
#else
sprintf(s, (diff == 1 ? "" : L_PLURAL));
sprintf(s, (diff == 1 ? "" : L_PLURAL));
#endif
s += strlen(s);
break;
@@ -346,7 +346,7 @@ int jul, mode;
#ifdef L_Q_OVER
L_Q_OVER
#else
sprintf(s, (diff == 1 ? "'s" : "s'"));
sprintf(s, (diff == 1 ? "'s" : "s'"));
#endif
s += strlen(s);
break;
@@ -355,7 +355,7 @@ int jul, mode;
#ifdef L_R_OVER
L_R_OVER
#else
sprintf(s, "%02d", d);
sprintf(s, "%02d", d);
#endif
s += strlen(s);
break;
@@ -364,7 +364,7 @@ int jul, mode;
#ifdef L_S_OVER
L_S_OVER
#else
sprintf(s, plu);
sprintf(s, plu);
#endif
s += strlen(s);
break;
@@ -373,7 +373,7 @@ int jul, mode;
#ifdef L_T_OVER
L_T_OVER
#else
sprintf(s, "%02d", m+1);
sprintf(s, "%02d", m+1);
#endif
s += strlen(s);
break;
@@ -382,8 +382,8 @@ int jul, mode;
#ifdef L_U_OVER
L_U_OVER
#else
sprintf(s, "%s %s, %d%s %s, %d", L_ON, DayName[jul%7], d,
plu, MonthName[m], y);
sprintf(s, "%s %s, %d%s %s, %d", L_ON, DayName[jul%7], d,
plu, MonthName[m], y);
#endif
s += strlen(s);
break;
@@ -392,8 +392,8 @@ int jul, mode;
#ifdef L_V_OVER
L_V_OVER
#else
sprintf(s, "%s %s, %d%s %s", L_ON, DayName[jul%7], d, plu,
MonthName[m]);
sprintf(s, "%s %s, %d%s %s", L_ON, DayName[jul%7], d, plu,
MonthName[m]);
#endif
s += strlen(s);
break;
@@ -402,7 +402,7 @@ int jul, mode;
#ifdef L_W_OVER
L_W_OVER
#else
sprintf(s, DayName[jul%7]);
sprintf(s, DayName[jul%7]);
#endif
s += strlen(s);
break;
@@ -411,7 +411,7 @@ int jul, mode;
#ifdef L_X_OVER
L_X_OVER
#else
sprintf(s, "%d", diff);
sprintf(s, "%d", diff);
#endif
s += strlen(s);
break;
@@ -420,7 +420,7 @@ int jul, mode;
#ifdef L_Y_OVER
L_Y_OVER
#else
sprintf(s, "%d", y);
sprintf(s, "%d", y);
#endif
s += strlen(s);
break;
@@ -429,7 +429,7 @@ int jul, mode;
#ifdef L_Z_OVER
L_Z_OVER
#else
sprintf(s, "%d", y % 100);
sprintf(s, "%d", y % 100);
#endif
s += strlen(s);
break;
@@ -438,15 +438,15 @@ int jul, mode;
#ifdef L_1_OVER
L_1_OVER
#else
if (tdiff == 0)
sprintf(s, L_NOW);
else if (hdiff == 0)
sprintf(s, "%d %s%s %s", mdiff, L_MINUTE, mplu, when);
else if (mdiff == 0)
sprintf(s, "%d %s%s %s", hdiff, L_HOUR, hplu, when);
else
sprintf(s, "%d %s%s %s %d %s%s %s", hdiff, L_HOUR, hplu,
L_AND, mdiff, L_MINUTE, mplu, when);
if (tdiff == 0)
sprintf(s, L_NOW);
else if (hdiff == 0)
sprintf(s, "%d %s%s %s", mdiff, L_MINUTE, mplu, when);
else if (mdiff == 0)
sprintf(s, "%d %s%s %s", hdiff, L_HOUR, hplu, when);
else
sprintf(s, "%d %s%s %s %d %s%s %s", hdiff, L_HOUR, hplu,
L_AND, mdiff, L_MINUTE, mplu, when);
#endif
s += strlen(s);
break;
@@ -455,7 +455,7 @@ int jul, mode;
#ifdef L_2_OVER
L_2_OVER
#else
sprintf(s, "%s %d%c%02d%s", L_AT, hh, TIMESEP, min, pm);
sprintf(s, "%s %d%c%02d%s", L_AT, hh, TIMESEP, min, pm);
#endif
s += strlen(s);
break;
@@ -465,7 +465,7 @@ int jul, mode;
L_3_OVER
#else
sprintf(s, "%s %02d%c%02d", L_AT, h, TIMESEP, min);
sprintf(s, "%s %02d%c%02d", L_AT, h, TIMESEP, min);
#endif
s += strlen(s);
break;
@@ -474,7 +474,7 @@ int jul, mode;
#ifdef L_4_OVER
L_4_OVER
#else
sprintf(s, "%d", tdiff);
sprintf(s, "%d", tdiff);
#endif
s += strlen(s);
break;
@@ -483,7 +483,7 @@ int jul, mode;
#ifdef L_5_OVER
L_5_OVER
#else
sprintf(s, "%d", adiff);
sprintf(s, "%d", adiff);
#endif
s += strlen(s);
break;
@@ -492,7 +492,7 @@ int jul, mode;
#ifdef L_6_OVER
L_6_OVER
#else
sprintf(s, when);
sprintf(s, when);
#endif
s += strlen(s);
break;
@@ -501,7 +501,7 @@ int jul, mode;
#ifdef L_7_OVER
L_7_OVER
#else
sprintf(s, "%d", hdiff);
sprintf(s, "%d", hdiff);
#endif
s += strlen(s);
break;
@@ -510,7 +510,7 @@ int jul, mode;
#ifdef L_8_OVER
L_8_OVER
#else
sprintf(s, "%d", mdiff);
sprintf(s, "%d", mdiff);
#endif
s += strlen(s);
break;
@@ -519,7 +519,7 @@ int jul, mode;
#ifdef L_9_OVER
L_9_OVER
#else
sprintf(s, mplu);
sprintf(s, mplu);
#endif
s += strlen(s);
break;
@@ -528,7 +528,7 @@ int jul, mode;
#ifdef L_0_OVER
L_0_OVER
#else
sprintf(s, hplu);
sprintf(s, hplu);
#endif
s += strlen(s);
break;
@@ -537,7 +537,7 @@ int jul, mode;
#ifdef L_BANG_OVER
L_BANG_OVER
#else
sprintf(s, (tdiff >= 0 ? L_IS : L_WAS));
sprintf(s, (tdiff >= 0 ? L_IS : L_WAS));
#endif
s += strlen(s);
break;
@@ -546,7 +546,7 @@ int jul, mode;
#ifdef L_AT_OVER
L_AT_OVER
#else
sprintf(s, "%d%c%02d%s", chh, TIMESEP, cmin, cpm);
sprintf(s, "%d%c%02d%s", chh, TIMESEP, cmin, cpm);
#endif
s += strlen(s);
break;
@@ -555,7 +555,7 @@ int jul, mode;
#ifdef L_HASH_OVER
L_HASH_OVER
#else
sprintf(s, "%02d%c%02d", ch, TIMESEP, cmin);
sprintf(s, "%02d%c%02d", ch, TIMESEP, cmin);
#endif
s += strlen(s);
break;

View File

@@ -15,7 +15,7 @@
/* */
/***************************************************************/
/* $Id: finnish.h,v 1.2 1996-04-28 02:01:56 dfs Exp $ */
/* $Id: finnish.h,v 1.3 1996-04-29 19:34:37 dfs Exp $ */
/* The very first define in a language support file must be L_LANGNAME: */
#define L_LANGNAME "Finnish"
@@ -128,42 +128,42 @@
#if defined(ISOLATIN1)
#define L_ORDINAL_OVERRIDE switch(d) { \
case 1: plu = ":sen\xE4"; break; \
case 2: plu = ":sena"; break; \
default: \
switch(d%10) { \
case 2: \
case 3: \
case 6: \
case 8: plu = ":ntena"; break; \
default: plu = ":nten\xE4"; break; \
} \
}
case 2: plu = ":sena"; break; \
default: \
switch(d%10) { \
case 2: \
case 3: \
case 6: \
case 8: plu = ":ntena"; break; \
default: plu = ":nten\xE4"; break; \
} \
}
#elif defined(IBMEXTENDED)
#define L_ORDINAL_OVERRIDE switch(d) { \
case 1: plu = ":sen\x84"; break; \
case 2: plu = ":sena"; break; \
default: \
switch(d%10) { \
case 2: \
case 3: \
case 6: \
case 8: plu = ":ntena"; break; \
default: plu = ":nten\x84"; break; \
} \
}
case 2: plu = ":sena"; break; \
default: \
switch(d%10) { \
case 2: \
case 3: \
case 6: \
case 8: plu = ":ntena"; break; \
default: plu = ":nten\x84"; break; \
} \
}
#else
#define L_ORDINAL_OVERRIDE switch(d) { \
case 1: plu = ":sen{"; break; \
case 2: plu = ":sena"; break; \
default: \
switch(d%10) { \
case 2: \
case 3: \
case 6: \
case 8: plu = ":ntena"; break; \
default: plu = ":nten{"; break; \
} \
}
case 2: plu = ":sena"; break; \
default: \
switch(d%10) { \
case 2: \
case 3: \
case 6: \
case 8: plu = ":ntena"; break; \
default: plu = ":nten{"; break; \
} \
}
#endif
#define L_A_OVER sprintf(s, "%s%s, %d. %s%s %d", DayName[jul%7], L_ON, d, \
MonthName[m], L_PARTIT, y);
@@ -188,23 +188,23 @@
#define L_1_OVER if (tdiff == 0) \
sprintf(s, L_NOW); \
else { \
if (hdiff != 0) { \
if (tdiff < 0) \
sprintf(s, "%d %s%s ", hdiff, L_HOUR, hplu); \
else \
sprintf(s, "%d %s ", hdiff, L_HGEN); \
s += strlen(s); \
} \
if (mdiff != 0) { \
if (tdiff < 0) \
sprintf(s, "%d %s%s ", mdiff, L_MINUTE, \
mplu); \
else \
sprintf(s, "%d %s ", mdiff, L_MGEN); \
s += strlen(s); \
} \
sprintf(s, when); \
}
if (hdiff != 0) { \
if (tdiff < 0) \
sprintf(s, "%d %s%s ", hdiff, L_HOUR, hplu); \
else \
sprintf(s, "%d %s ", hdiff, L_HGEN); \
s += strlen(s); \
} \
if (mdiff != 0) { \
if (tdiff < 0) \
sprintf(s, "%d %s%s ", mdiff, L_MINUTE, \
mplu); \
else \
sprintf(s, "%d %s ", mdiff, L_MGEN); \
s += strlen(s); \
} \
sprintf(s, when); \
}
#endif /* L_IN_DOSUBST */
/* The next ones are used only when MK_GLOBALS is set */

View File

@@ -14,7 +14,7 @@
/* */
/***************************************************************/
/* $Id: french.h,v 1.2 1996-04-28 02:01:57 dfs Exp $ */
/* $Id: french.h,v 1.3 1996-04-29 19:34:37 dfs Exp $ */
/* The very first define in a language support file must be L_LANGNAME: */
#define L_LANGNAME "French"
@@ -110,29 +110,28 @@
#define L_ORDINAL_OVERRIDE \
switch(d) { \
case 1: plu = "er"; break; \
\
default: plu = ""; break; \
}
case 1: plu = "er"; break; \
default: plu = ""; break; \
}
#define L_1_OVER \
if (tdiff == 0) \
sprintf(s, L_NOW); \
else if (tdiff < 0) { \
if (mdiff == 0) \
sprintf(s, "il y a %d heure%s", hdiff, hplu); \
else if (hdiff == 0) \
sprintf(s, "il y a %d minute%s", mdiff, mplu); \
else \
sprintf(s, "il y a %d heure%s et %d minute%s", hdiff, hplu, mdiff, mplu); \
} else { \
if (mdiff == 0) \
sprintf(s, "dans %d heure%s", hdiff, hplu); \
else if (hdiff == 0) \
sprintf(s, "dans %d minute%s", mdiff, mplu); \
else \
sprintf(s, "dans %d heure%s et %d minute%s", hdiff, hplu, mdiff, mplu); \
}
if (mdiff == 0) \
sprintf(s, "il y a %d heure%s", hdiff, hplu); \
else if (hdiff == 0) \
sprintf(s, "il y a %d minute%s", mdiff, mplu); \
else \
sprintf(s, "il y a %d heure%s et %d minute%s", hdiff, hplu, mdiff, mplu); \
} else { \
if (mdiff == 0) \
sprintf(s, "dans %d heure%s", hdiff, hplu); \
else if (hdiff == 0) \
sprintf(s, "dans %d minute%s", mdiff, mplu); \
else \
sprintf(s, "dans %d heure%s et %d minute%s", hdiff, hplu, mdiff, mplu); \
}
#define L_J_OVER \
sprintf(s, "%s %s, %d%s %s, %d", L_ON, DayName[jul%7], \
@@ -247,7 +246,8 @@ EXTERN char *ErrMsg[] =
"Remind: '-i' option: %s\n",
"Pas de rappels.",
"%d rappel(s) en file pour aujourd'hui.\n",
"Nombre attendu"
"Nombre attendu",
"Fonction ill\351gale apr\350s WARN"
#else /* ISOLATIN1 */
"Ok",
"']' manquant",

4
lang.h
View File

@@ -9,7 +9,7 @@
/* */
/***************************************************************/
/* $Id: lang.h,v 1.1 1996-03-27 03:25:59 dfs Exp $ */
/* $Id: lang.h,v 1.2 1996-04-29 19:34:38 dfs Exp $ */
/* I'm chauvinistic and name each language with its English name... */
@@ -22,7 +22,7 @@
#define DANISH 6 /* translated by Mogens Lynnerup */
#define POLISH 7 /* translated by Jerzy Sobczyk */
/* Add more languages here - but please e-mail dfs@doe.carleton.ca
/* Add more languages here - but please e-mail aa775@freenet.carleton.ca
to have your favorite language assigned a number. If you add a
language, please send me the header file, and permission to include
it in future releases of Remind. Note that you'll get no remuneration

View File

@@ -13,7 +13,7 @@
/* */
/***************************************************************/
/* $Id: polish.h,v 1.2 1996-04-28 02:02:00 dfs Exp $ */
/* $Id: polish.h,v 1.3 1996-04-29 19:34:38 dfs Exp $ */
/* The very first define in a language support file must be L_LANGNAME: */
#define L_LANGNAME "Polish"
@@ -117,10 +117,10 @@
/* What to add to make "hour" or "minute" plural */
#ifdef ISOLATIN1
#define L_NPLU( N ) ((N == 1) ? "\352" : ((N==12) || (N==13) || (N==14)) ? "" : \
((N%10==2) || (N%10==3) || (N%10==4)) ? "y" : "" )
((N%10==2) || (N%10==3) || (N%10==4)) ? "y" : "" )
#else
#define L_NPLU( N ) ((N == 1) ? "e" : ((N==12) || (N==13) || (N==14)) ? "" : \
((N%10==2) || (N%10==3) || (N%10==4)) ? "y" : "" )
((N%10==2) || (N%10==3) || (N%10==4)) ? "y" : "" )
#endif
/* What to add to make "hour" plural */
#define L_HPLU L_NPLU( hdiff )
@@ -132,12 +132,12 @@
#ifdef ISOLATIN1
#define L_AMPM_OVERRIDE(ampm, hour) \
ampm = (hour<12) ? \
(hour<5) ? " w nocy" \
: (hour<10) ? " rano" \
: " przed po\263udniem" \
: (hour<18) ? " po po\263udniu" \
: (hour<22) ? " wieczorem" \
: " w nocy";
(hour<5) ? " w nocy" \
: (hour<10) ? " rano" \
: " przed po\263udniem" \
: (hour<18) ? " po po\263udniu" \
: (hour<22) ? " wieczorem" \
: " w nocy";
#else
#define L_AMPM_OVERRIDE(ampm, hour) \
ampm = (hour<12) ? \
@@ -164,23 +164,23 @@ sprintf(s, L_NOW); \
else if (tdiff > 0) \
{ \
if (hdiff == 0) \
sprintf(s, "za %d %s%s", mdiff, L_MINUTE, L_MPLU); \
else if (mdiff == 0) \
sprintf(s, "za %d %s%s", hdiff, L_HOUR, L_HPLU); \
else \
sprintf(s, "za %d %s%s %s %d %s%s", hdiff, L_HOUR, L_HPLU, \
L_AND, mdiff, L_MINUTE, L_MPLU); \
} \
sprintf(s, "za %d %s%s", mdiff, L_MINUTE, L_MPLU); \
else if (mdiff == 0) \
sprintf(s, "za %d %s%s", hdiff, L_HOUR, L_HPLU); \
else \
sprintf(s, "za %d %s%s %s %d %s%s", hdiff, L_HOUR, L_HPLU, \
L_AND, mdiff, L_MINUTE, L_MPLU); \
} \
else \
{ \
if (hdiff == 0) \
sprintf(s, "%d %s%s temu", mdiff, L_MINUTE, L_MPLU); \
else if (mdiff == 0) \
sprintf(s, "%d %s%s temu", hdiff, L_HOUR, L_HPLU); \
else \
sprintf(s, "%d %s%s %s %d %s%s temu", hdiff, L_HOUR, L_HPLU, \
L_AND, mdiff, L_MINUTE, L_MPLU); \
}
if (hdiff == 0) \
sprintf(s, "%d %s%s temu", mdiff, L_MINUTE, L_MPLU); \
else if (mdiff == 0) \
sprintf(s, "%d %s%s temu", hdiff, L_HOUR, L_HPLU); \
else \
sprintf(s, "%d %s%s %s %d %s%s temu", hdiff, L_HOUR, L_HPLU, \
L_AND, mdiff, L_MINUTE, L_MPLU); \
}
/* The next ones are used only when MK_GLOBALS is set */
#ifdef MK_GLOBALS

View File

@@ -1,4 +1,4 @@
# $Id: smakefile,v 1.1 1996-03-31 04:01:58 dfs Exp $
# $Id: smakefile,v 1.2 1996-04-29 19:34:39 dfs Exp $
# Makefile for REMIND, suitable for SAS/C 6.50 under AmigaDOS
# English version
@@ -34,7 +34,7 @@ LANGHDRS= english.h german.h dutch.h finnish.h french.h norwgian.h
SRCS= calendar.c dorem.c dosubst.c expr.c files.c funcs.c globals.c hbcal.c \
init.c main.c moon.c omit.c sort.c queue.c token.c trigger.c userfns.c \
utils.c var.c amiga/amiga.c
utils.c var.c amiga.c
OBJS= calendar.o dorem.o dosubst.o expr.o files.o funcs.o globals.o hbcal.o \
init.o main.o moon.o omit.o sort.o queue.o token.o trigger.o userfns.o \
@@ -89,5 +89,5 @@ userfns.o: userfns.c $(STDHDRS) expr.h
utils.o: utils.c $(STDHDRS)
var.o: var.c $(STDHDRS) expr.h
amiga.o: amiga/amiga.c
$(CC) OBJNAME=amiga.o $(CFLAGS) amiga/amiga.c
amiga.o: amiga.c
$(CC) OBJNAME=amiga.o $(CFLAGS) amiga.c