sync with update-patches

This commit is contained in:
avsm 2003-06-18 02:47:59 +00:00
parent acf37a7c60
commit 2c0f85b404
17 changed files with 114 additions and 102 deletions

View File

@ -1,19 +0,0 @@
--- cal2ct.c.orig Wed Sep 30 11:44:27 1998
+++ cal2ct.c Wed Sep 30 11:45:06 1998
@@ -71,7 +71,7 @@
#endif
#endif
-void
+int
main(argc, argv)
int argc;
char *argv[];
@@ -136,6 +136,7 @@
exit(1);
}
write_ct_file();
+ return 0;
}
/*

View File

@ -1,19 +0,0 @@
--- month2ct.c.orig Wed Sep 30 11:46:49 1998
+++ month2ct.c Wed Sep 30 11:46:57 1998
@@ -43,7 +43,7 @@
void write_ct_file ();
#endif
-void
+int
main(argc, argv)
int argc;
char *argv[];
@@ -66,6 +66,7 @@
exit(1);
}
write_ct_file();
+ return 0;
}
/*

View File

@ -1,11 +0,0 @@
--- moon.c.orig Tue Sep 29 22:38:23 1998
+++ moon.c Wed Sep 30 11:36:47 1998
@@ -359,7 +359,7 @@
void
moon_data(seconds)
-long seconds;
+time_t seconds;
{
int lunation;
int i;

View File

@ -1,19 +0,0 @@
--- mt2ct.c.orig Wed Sep 30 11:47:04 1998
+++ mt2ct.c Wed Sep 30 11:47:14 1998
@@ -45,7 +45,7 @@
void write_ct_file ();
#endif
-void
+int
main(argc, argv)
int argc;
char *argv[];
@@ -74,6 +74,7 @@
exit(1);
}
write_ct_file();
+ return 0;
}
/*

View File

@ -1,11 +0,0 @@
--- utils.c.orig Tue Sep 29 22:38:24 1998
+++ utils.c Wed Sep 30 11:36:47 1998
@@ -170,7 +170,7 @@
#else
gettimeofday(&tv, 0);
#endif
- tm = localtime(&tv.tv_sec);
+ tm = localtime((time_t*)&tv.tv_sec);
today = *tm;

View File

@ -1,5 +1,6 @@
--- Imakefile.orig Wed Sep 30 04:38:28 1998
+++ Imakefile Mon Apr 3 01:51:07 2000
$OpenBSD: patch-Imakefile,v 1.1 2003/06/18 02:48:00 avsm Exp $
--- Imakefile.orig Wed Sep 30 03:38:28 1998
+++ Imakefile Wed Jun 18 03:41:50 2003
@@ -115,10 +115,10 @@ NR_WEEKDAYS = 5
START_HOUR = 8
END_HOUR = 18

View File

@ -0,0 +1,20 @@
$OpenBSD: patch-cal2ct_c,v 1.1 2003/06/18 02:48:00 avsm Exp $
--- cal2ct.c.orig Wed Sep 30 03:38:28 1998
+++ cal2ct.c Wed Jun 18 03:41:50 2003
@@ -71,7 +71,7 @@ int dysize();
#endif
#endif
-void
+int
main(argc, argv)
int argc;
char *argv[];
@@ -136,6 +136,7 @@ char *argv[];
exit(1);
}
write_ct_file();
+ return 0;
}
/*

View File

@ -1,6 +1,7 @@
--- calencheck.c.orig Wed Sep 30 11:45:30 1998
+++ calencheck.c Wed Sep 30 11:46:30 1998
@@ -53,7 +53,7 @@
$OpenBSD: patch-calencheck_c,v 1.1 2003/06/18 02:48:00 avsm Exp $
--- calencheck.c.orig Wed Sep 30 03:38:28 1998
+++ calencheck.c Wed Jun 18 03:41:50 2003
@@ -53,7 +53,7 @@ struct dayslot *slots;
int show_future = 1;
int one_based = 0, version2 = 0;
@ -9,7 +10,7 @@
main(argc,argv)
int argc;
char *argv[];
@@ -129,6 +129,7 @@
@@ -129,6 +129,7 @@ char *argv[];
sleep(TIME_OUT*60);
check_calendar();
}

View File

@ -1,6 +1,7 @@
--- calentool.c.orig Tue Sep 29 22:41:22 1998
+++ calentool.c Wed Sep 30 11:36:45 1998
@@ -221,7 +221,7 @@
$OpenBSD: patch-calentool_c,v 1.1 2003/06/18 02:48:00 avsm Exp $
--- calentool.c.orig Wed Sep 30 03:41:22 1998
+++ calentool.c Wed Jun 18 03:41:50 2003
@@ -221,7 +221,7 @@ void create_icon ();
void set_cms();
#endif
@ -9,7 +10,7 @@
int argc;
char *argv[];
{
@@ -898,6 +898,7 @@
@@ -898,6 +898,7 @@ char *argv[];
xv_main_loop(frame);
(void)leave((Notify_client)0, 0, (Notify_signal_mode)0);
@ -17,7 +18,7 @@
}
@@ -1017,7 +1018,7 @@
@@ -1017,7 +1018,7 @@ XErrorEvent *myerror;
fputs("\n ", stderr);
XGetErrorDatabaseText(mydisplay, "XlibMessage", "CurrentSerial",
"Current Serial #%d", error_mesg, 1024);

View File

@ -1,6 +1,7 @@
--- ctexterns.h.orig Tue Sep 29 22:38:23 1998
+++ ctexterns.h Wed Sep 30 11:36:46 1998
@@ -87,7 +87,7 @@
$OpenBSD: patch-ctexterns_h,v 1.1 2003/06/18 02:48:00 avsm Exp $
--- ctexterns.h.orig Wed Sep 30 03:38:23 1998
+++ ctexterns.h Wed Jun 18 03:41:50 2003
@@ -87,7 +87,7 @@ extern void lastyear (void);
extern int length_of_year (int year);
extern void lock_cursors (void);
extern int monthlength (int month);

View File

@ -1,5 +1,6 @@
--- dates/computing.orig Tue Sep 29 22:38:17 1998
+++ dates/computing Wed Sep 30 11:31:15 1998
$OpenBSD: patch-dates_computing,v 1.1 2003/06/18 02:48:00 avsm Exp $
--- dates/computing.orig Wed Sep 30 03:38:17 1998
+++ dates/computing Wed Jun 18 03:41:50 2003
@@ -149,3 +149,4 @@
** 12 27 99 99 00 APT report published (1956)
** 12 28 99 99 00 John Von Neumann, First suggested stored program model. (1903)

View File

@ -0,0 +1,20 @@
$OpenBSD: patch-month2ct_c,v 1.1 2003/06/18 02:48:00 avsm Exp $
--- month2ct.c.orig Wed Sep 30 03:38:20 1998
+++ month2ct.c Wed Jun 18 03:41:50 2003
@@ -43,7 +43,7 @@ void write_ct_file (void);
void write_ct_file ();
#endif
-void
+int
main(argc, argv)
int argc;
char *argv[];
@@ -66,6 +66,7 @@ char *argv[];
exit(1);
}
write_ct_file();
+ return 0;
}
/*

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-moon_c,v 1.1 2003/06/18 02:48:00 avsm Exp $
--- moon.c.orig Wed Sep 30 03:38:23 1998
+++ moon.c Wed Jun 18 03:41:50 2003
@@ -359,7 +359,7 @@ Pixmap src_pr, dst_pr;
void
moon_data(seconds)
-long seconds;
+time_t seconds;
{
int lunation;
int i;

View File

@ -0,0 +1,20 @@
$OpenBSD: patch-mt2ct_c,v 1.1 2003/06/18 02:48:00 avsm Exp $
--- mt2ct.c.orig Wed Sep 30 03:38:21 1998
+++ mt2ct.c Wed Jun 18 03:41:50 2003
@@ -45,7 +45,7 @@ int read_mt_file ();
void write_ct_file ();
#endif
-void
+int
main(argc, argv)
int argc;
char *argv[];
@@ -74,6 +74,7 @@ char *argv[];
exit(1);
}
write_ct_file();
+ return 0;
}
/*

View File

@ -1,6 +1,7 @@
--- printer.c.orig Tue Sep 29 22:38:24 1998
+++ printer.c Wed Sep 30 11:36:47 1998
@@ -72,8 +72,8 @@
$OpenBSD: patch-printer_c,v 1.1 2003/06/18 02:48:00 avsm Exp $
--- printer.c.orig Wed Sep 30 03:38:24 1998
+++ printer.c Wed Jun 18 03:41:50 2003
@@ -72,8 +72,8 @@ extern int print_trailer;
int format = ZPixmap;
char trailer[256];
@ -11,7 +12,7 @@
#ifdef __STDC__
void print_one_day (int which, FILE *output, int gdrtn);
@@ -319,12 +319,12 @@
@@ -319,12 +319,12 @@ int which, dest;
int i, gd_rtn, target, ndays;
FILE *output, *popen();
int pclose();
@ -26,7 +27,7 @@
gd_rtn = get_day_appts();
if (which == PRI_DAY && !gd_rtn)
return; /* nothing to show */
@@ -334,7 +334,7 @@
@@ -334,7 +334,7 @@ int which, dest;
if (dest == DST_MAIL) {
if (mailto != NULL) {
name = mailto;
@ -35,7 +36,7 @@
err_rpt("nobody to mail to", FATAL);
}
sprintf(cmd, "%s -s \"Appointments for %s\" %s", MAILPROG, mail_subj(which), name);
@@ -510,7 +510,7 @@
@@ -510,7 +510,7 @@ int file_type;
lock_cursors();
working(TRUE);
sprintf(trailer, "File: '%s' printed for %s on %s",

View File

@ -1,5 +1,6 @@
$OpenBSD: patch-riseset_c,v 1.1 2003/06/18 02:48:00 avsm Exp $
--- riseset.c.orig Wed Sep 30 03:38:24 1998
+++ riseset.c Wed Jun 18 03:38:06 2003
+++ riseset.c Wed Jun 18 03:41:50 2003
@@ -48,7 +48,7 @@
extern char *daynames[], *monthnames[];
extern int day_first;

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-utils_c,v 1.1 2003/06/18 02:48:00 avsm Exp $
--- utils.c.orig Wed Sep 30 03:38:24 1998
+++ utils.c Wed Jun 18 03:41:50 2003
@@ -170,7 +170,7 @@ get_today()
#else
gettimeofday(&tv, 0);
#endif
- tm = localtime(&tv.tv_sec);
+ tm = localtime((time_t*)&tv.tv_sec);
today = *tm;