Only in megahal-9.1.1a+pasky/Megahal: .megahal.c.swp
Only in megahal-9.1.1a+pasky/Megahal: Makefile
Only in megahal-9.1.1a+pasky/Megahal: Megahal.bs
Only in megahal-9.1.1a+pasky/Megahal: Megahal.c
Only in megahal-9.1.1a+pasky/Megahal: Megahal.o
Only in megahal-9.1.1a+pasky/Megahal: blib
diff -ru megahal-9.1.1a/Megahal/const-c.inc megahal-9.1.1a+pasky/Megahal/const-c.inc
--- megahal-9.1.1a/Megahal/const-c.inc	2004-02-25 21:47:46.000000000 +0100
+++ megahal-9.1.1a+pasky/Megahal/const-c.inc	2010-06-17 01:17:03.000000000 +0200
@@ -39,11 +39,11 @@
 my $types = {map {($_, 1)} qw(IV)};
 my @names = (qw(MEGAHAL_H));
 
-print constant_types(); # macro defs
+print constant_types(), "\n"; # macro defs
 foreach (C_constant ("Megahal", 'constant', 'IV', $types, undef, 3, @names) ) {
     print $_, "\n"; # C constant subs
 }
-print "#### XS Section:\n";
+print "\n#### XS Section:\n";
 print XS_constant ("Megahal", $types);
 __END__
    */
diff -ru megahal-9.1.1a/Megahal/const-xs.inc megahal-9.1.1a+pasky/Megahal/const-xs.inc
--- megahal-9.1.1a/Megahal/const-xs.inc	2004-02-25 21:47:46.000000000 +0100
+++ megahal-9.1.1a+pasky/Megahal/const-xs.inc	2010-06-17 01:17:03.000000000 +0200
@@ -22,12 +22,14 @@
            Second, if present, is found value */
         switch (type) {
         case PERL_constant_NOTFOUND:
-          sv = sv_2mortal(newSVpvf("%s is not a valid Megahal macro", s));
+          sv =
+	    sv_2mortal(newSVpvf("%s is not a valid Megahal macro", s));
           PUSHs(sv);
           break;
         case PERL_constant_NOTDEF:
           sv = sv_2mortal(newSVpvf(
-	    "Your vendor has not defined Megahal macro %s, used", s));
+	    "Your vendor has not defined Megahal macro %s, used",
+				   s));
           PUSHs(sv);
           break;
         case PERL_constant_ISIV:
diff -ru megahal-9.1.1a/Megahal/megahal.c megahal-9.1.1a+pasky/Megahal/megahal.c
--- megahal-9.1.1a/Megahal/megahal.c	2004-02-25 21:47:46.000000000 +0100
+++ megahal-9.1.1a+pasky/Megahal/megahal.c	2010-06-28 22:36:53.000000000 +0200
@@ -101,6 +101,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
+#include <stdint.h>
 #include <unistd.h>
 #include <getopt.h>
 #if !defined(AMIGA) && !defined(__mac_os)
@@ -137,9 +138,9 @@
 
 #define COMMAND_SIZE (sizeof(command)/sizeof(command[0]))
 
-#define BYTE1 unsigned char
-#define BYTE2 unsigned short
-#define BYTE4 unsigned long
+#define BYTE1 uint8_t
+#define BYTE2 uint16_t
+#define BYTE4 uint32_t
 
 #ifdef __mac_os
 #define bool Boolean
@@ -2205,7 +2206,8 @@
      */
     max_surprise=(float)-1.0;
     count=0;
-    basetime=time(NULL);
+    struct timespec now, then;
+    clock_gettime(CLOCK_REALTIME, &now);
 /*     progress("Generating reply", 0, 1);  */
     do {
 	replywords=reply(model, keywords);
@@ -2216,7 +2218,8 @@
 	    output=make_output(replywords);
 	}
 /*  	progress(NULL, (time(NULL)-basetime),timeout); */
-    } while((time(NULL)-basetime)<timeout);
+	clock_gettime(CLOCK_REALTIME, &then);
+    } while(((then.tv_sec - now.tv_sec) * 1000000000 + then.tv_nsec - now.tv_nsec)<timeout*1000000000);
     progress(NULL, 1, 1);
 
     /*
Only in megahal-9.1.1a+pasky/Megahal: megahal.o
Only in megahal-9.1.1a+pasky/Megahal: pm_to_blib
Only in megahal-9.1.1a+pasky/: build
Only in megahal-9.1.1a+pasky/: build-stamp
Only in megahal-9.1.1a+pasky/debian: files
Only in megahal-9.1.1a+pasky/debian: megahal
Only in megahal-9.1.1a+pasky/debian: megahal.debhelper.log
Only in megahal-9.1.1a+pasky/debian: megahal.postinst.debhelper
Only in megahal-9.1.1a+pasky/debian: megahal.postrm.debhelper
Only in megahal-9.1.1a+pasky/debian: megahal.prerm.debhelper
Only in megahal-9.1.1a+pasky/debian: megahal.substvars
Only in megahal-9.1.1a+pasky/: libmh_tcl.so
Only in megahal-9.1.1a+pasky/: main.o
Only in megahal-9.1.1a+pasky/: megahal
diff -ru megahal-9.1.1a/megahal.c megahal-9.1.1a+pasky/megahal.c
--- megahal-9.1.1a/megahal.c	2010-06-28 22:44:05.000000000 +0200
+++ megahal-9.1.1a+pasky/megahal.c	2010-06-17 01:14:27.000000000 +0200
@@ -101,6 +101,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
+#include <stdint.h>
 #include <unistd.h>
 #include <getopt.h>
 #if !defined(AMIGA) && !defined(__mac_os)
@@ -137,9 +138,9 @@
 
 #define COMMAND_SIZE (sizeof(command)/sizeof(command[0]))
 
-#define BYTE1 unsigned char
-#define BYTE2 unsigned short
-#define BYTE4 unsigned long
+#define BYTE1 uint8_t
+#define BYTE2 uint16_t
+#define BYTE4 uint32_t
 
 #ifdef __mac_os
 #define bool Boolean
Only in megahal-9.1.1a+pasky/: megahal.dic.backup
Only in megahal-9.1.1a+pasky/: megahal.o
Only in megahal-9.1.1a+pasky/: tcl-interface.o
