1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-29 01:13:08 +00:00
freebsd-ports/comms/chu/files/patch-chu.c
Diane Bruce 038c554165 - Fix build under clang
- main() must return int
- returns must return something from main
2011-07-01 12:45:08 +00:00

105 lines
1.9 KiB
C

--- chu.c.orig 1999-03-17 11:42:18.000000000 -0500
+++ chu.c 2011-07-01 08:42:06.000000000 -0400
@@ -20,15 +20,21 @@
#include <stdlib.h>
#include <string.h>
#include <math.h>
+#include <errno.h>
+#include <sys/types.h>
#include <sys/time.h>
#include <sys/resource.h>
#include <unistd.h>
-#define USE_TIMEX
+#define ADJTIME
+#undef USE_TIMEX
+#define USE_ADJTIME
+
+#ifdef ADJTIME
#ifdef USE_TIMEX
#include <sys/timex.h>
#endif
-
+#endif
#define SAMPLE_RATE 8000
#define SAMPLES 512
#define OVERLAP 50
@@ -389,6 +395,21 @@
}
}
+#ifdef USE_ADJTIME
+void
+do_adjtime(int microsec)
+{
+ struct timeval delta;
+ int status;
+
+ printf("do_adjtime adjustment: %d\n", microsec);
+ delta.tv_sec = 0;
+ delta.tv_usec = microsec;
+ status = adjtime(&delta, NULL);
+ printf("do_adjtime status: %d\n", status);
+}
+#endif
+
#ifdef USE_TIMEX
void timex_adjustment(int microsec)
{
@@ -462,7 +483,8 @@
adjtimex(&t);
offset = t.offset;
#endif
-
+#ifdef USE_ADJTIME
+#endif
return (double) offset;
}
@@ -655,13 +677,18 @@
tv.tv_usec += 1000000;
}
+#ifdef ADJTIME
#ifdef USE_TIMEX
if (fabs(d) < ((double)MAXPHASE))
{
timex_adjustment((int)-d);
}
+#else
+ if (fabs(d) < ((double)1000000))
+ do_adjtime((int)-d);
else
#endif
+#endif
{
printf("standard adjustment ");
@@ -1267,7 +1294,7 @@
return fname;
}
-void main(int argc, char **argv)
+int main(int argc, char **argv)
{
FILE *fp;
signed char buf[8192];
@@ -1278,7 +1305,7 @@
fname = parseArgs(argc, argv);
if (fname == NULL)
- return;
+ return 0;
/* Set priority to maximum -- just long enough for us
to open the audio device and timestamp it. This should
@@ -1293,7 +1320,7 @@
if (fp == NULL)
{
printf("fopen(): Unable to open file: %s %s\n", fname, strerror(errno));
- return;
+ return 0;
}
gettimeofday(&starttime, &tz);