tailib: switch to unit64_t

This gets rid of tryulong64.c, a buildtime configure binary which interferes
with cross-compilation, at the cost of bumping the minimum C version to C99.

Author: 0x5c

src/Makefile

@@ -236,7 +236,7 @@ haswaitp.h: choose compile haswaitp.h1 haswaitp.h2 load trywaitp.c
 iopause.h: choose compile iopause.h1 iopause.h2 load trypoll.c
 	./choose clr trypoll iopause.h1 iopause.h2 > iopause.h
 
-iopause.o: iopause.c iopause.h select.h tai.h taia.h uint64.h
+iopause.o: iopause.c iopause.h select.h tai.h taia.h
 	$(CC) $(CFLAGS) -c iopause.c
 
 load: conf-ld print-ld.sh warn-auto.sh
@@ -363,56 +363,55 @@ subgetopt.o: subgetopt.c subgetopt.h
 
 sysdeps: compile direntry.h hasflock.h hasmkffo.h hassgact.h \
 hassgprm.h haswaitp.h iopause.h load select.h \
-uint64.h reboot_system.h uw_tmp.h socket.lib
+reboot_system.h uw_tmp.h socket.lib
 	rm -f sysdeps
 	cat compile load socket.lib >>sysdeps
 	grep sysdep direntry.h >>sysdeps
 	grep sysdep haswaitp.h >>sysdeps
 	grep sysdep hassgact.h >>sysdeps
 	grep sysdep hassgprm.h >>sysdeps
 	grep sysdep select.h >>sysdeps
-	grep sysdep uint64.h >>sysdeps
 	grep sysdep iopause.h >>sysdeps
 	grep sysdep hasmkffo.h >>sysdeps
 	grep sysdep hasflock.h >>sysdeps
 	grep sysdep reboot_system.h >>sysdeps
 	grep sysdep uw_tmp.h >>sysdeps
 	cat sysdeps
 
-tai_now.o: tai.h tai_now.c uint64.h
+tai_now.o: tai.h tai_now.c
 	$(CC) $(CFLAGS) -c tai_now.c
 
-tai_pack.o: tai.h tai_pack.c uint64.h
+tai_pack.o: tai.h tai_pack.c
 	$(CC) $(CFLAGS) -c tai_pack.c
 
-tai_sub.o: tai.h tai_sub.c uint64.h
+tai_sub.o: tai.h tai_sub.c
 	$(CC) $(CFLAGS) -c tai_sub.c
 
-tai_unpack.o: tai.h tai_unpack.c uint64.h
+tai_unpack.o: tai.h tai_unpack.c
 	$(CC) $(CFLAGS) -c tai_unpack.c
 
-taia_add.o: tai.h taia.h taia_add.c uint64.h
+taia_add.o: tai.h taia.h taia_add.c
 	$(CC) $(CFLAGS) -c taia_add.c
 
-taia_approx.o: tai.h taia.h taia_approx.c uint64.h
+taia_approx.o: tai.h taia.h taia_approx.c
 	$(CC) $(CFLAGS) -c taia_approx.c
 
-taia_frac.o: tai.h taia.h taia_frac.c uint64.h
+taia_frac.o: tai.h taia.h taia_frac.c
 	$(CC) $(CFLAGS) -c taia_frac.c
 
-taia_less.o: tai.h taia.h taia_less.c uint64.h
+taia_less.o: tai.h taia.h taia_less.c
 	$(CC) $(CFLAGS) -c taia_less.c
 
-taia_now.o: tai.h taia.h taia_now.c uint64.h
+taia_now.o: tai.h taia.h taia_now.c
 	$(CC) $(CFLAGS) -c taia_now.c
 
-taia_pack.o: tai.h taia.h taia_pack.c uint64.h
+taia_pack.o: tai.h taia.h taia_pack.c
 	$(CC) $(CFLAGS) -c taia_pack.c
 
-taia_sub.o: tai.h taia.h taia_sub.c uint64.h
+taia_sub.o: tai.h taia.h taia_sub.c
 	$(CC) $(CFLAGS) -c taia_sub.c
 
-taia_uint.o: tai.h taia.h taia_uint.c uint64.h
+taia_uint.o: tai.h taia.h taia_uint.c
 	$(CC) $(CFLAGS) -c taia_uint.c
 
 time.a: iopause.o makelib tai_now.o tai_pack.o tai_sub.o tai_unpack.o \
@@ -422,9 +421,6 @@ taia_pack.o taia_sub.o taia_uint.o
 	tai_unpack.o taia_add.o taia_approx.o taia_frac.o taia_less.o \
 	taia_now.o taia_pack.o taia_sub.o taia_uint.o
 
-uint64.h: choose compile load tryulong64.c uint64.h1 uint64.h2
-	./choose clr tryulong64 uint64.h1 uint64.h2 > uint64.h
-
 unix.a: alloc.o alloc_re.o buffer.o buffer_0.o buffer_1.o buffer_2.o \
 buffer_get.o buffer_put.o buffer_read.o buffer_write.o coe.o env.o \
 error.o error_str.o fd_copy.o fd_move.o fifo.o lock_ex.o lock_exnb.o \

src/TARGETS

@@ -119,7 +119,6 @@ taia_pack.o
 taia_sub.o
 taia_uint.o
 time.a
-uint64.h
 unix.a
 wait_nohang.o
 wait_pid.o

src/runsvdir.c

@@ -233,7 +233,7 @@ int main(int argc, char **argv) {
             dev =s.st_dev;
             ino =s.st_ino;
             check =0;
-            if (now.sec.x <= (4611686018427387914ULL +(uint64)mtime))
+            if (now.sec.x <= (4611686018427387914ULL +(uint64_t)mtime))
               sleep(1);
             runsvdir();
             while (fchdir(curdir) == -1) {

src/tai.h

@@ -3,13 +3,13 @@
 #ifndef TAI_H
 #define TAI_H
 
-#include "uint64.h"
+#include <stdint.h>
 
 struct tai {
-  uint64 x;
+  uint64_t x;
 } ;
 
-#define tai_unix(t,u) ((void) ((t)->x = 4611686018427387914ULL + (uint64) (u)))
+#define tai_unix(t,u) ((void) ((t)->x = 4611686018427387914ULL + (uint64_t) (u)))
 
 extern void tai_now(struct tai *);
 

src/tai_pack.c

@@ -4,7 +4,7 @@
 
 void tai_pack(char *s,const struct tai *t)
 {
-  uint64 x;
+  uint64_t x;
 
   x = t->x;
   s[7] = x & 255; x >>= 8;

src/tai_unpack.c

@@ -4,7 +4,7 @@
 
 void tai_unpack(const char *s,struct tai *t)
 {
-  uint64 x;
+  uint64_t x;
 
   x = (unsigned char) s[0];
   x <<= 8; x += (unsigned char) s[1];