More Build Fixes IssueID #240

diff --git a/hdrs/parse.h b/hdrs/parse.h
index 93c2b2982b89553c9c651906f16007cdc973b427..6dd83bd55c8358366c543466145bd94fd8ceeea2 100644 (file)
--- a/hdrs/parse.h
+++ b/hdrs/parse.h
@@ -66,8 +66,8 @@ uint32_t parse_uint32(const char *, char **, int);
 #define unparse_boolean(x) ((x) ? "1" : "0")
 
 char *unparse_dbref(dbref num);
-char *unparse_integer(long num);
-char *unparse_uinteger(unsigned long num);
+char *unparse_integer(intmax_t num);
+char *unparse_uinteger(uintmax_t num);
 char *unparse_number(NVAL num);
 char *unparse_types(int type);
 

diff --git a/src/cron.c b/src/cron.c
index 32719618bb0590dadee2935ded6fe0b933edcb6e..35e6b8fcd4c85145d59268a00908f69f495ed2f0 100644 (file)
--- a/src/cron.c
+++ b/src/cron.c
@@ -19,9 +19,7 @@
 #include "cron.h"
 
 #include <ctype.h>
-#ifdef I_STRING
 #include <string.h>
-#endif
 
 #ifdef MUSHCRON
 

diff --git a/src/db.c b/src/db.c
index 360a5f5530a50c094850f4b1a58e3e354aaa3001..382d64e2dd537d4b853f06e66348fa669dbe164c 100644 (file)
--- a/src/db.c
+++ b/src/db.c
@@ -646,7 +646,8 @@ db_write_labeled_int(FILE * f, char const *label, int value)
 void
 db_write_labeled_time_t(FILE * f, char const *label, time_t value)
 {
-  OUTPUT(fprintf(f, "%s %zu\n", label, value));
+/* FIXME: I added (size_t) type cast just to get it to compile */
+  OUTPUT(fprintf(f, "%s %zu\n", label, (size_t)value));
 }
 
 void

diff --git a/src/funcrypt.c b/src/funcrypt.c
index 82e328035fc6d3f6e26d9cffb99cfb31103da67a..2334ac5e7844c21f5a4cc0f9324d995bba45bfbb 100644 (file)
--- a/src/funcrypt.c
+++ b/src/funcrypt.c
@@ -40,7 +40,9 @@
 static char *crunch_code(char *code);
 static char *crypt_code(char *code, char *text, int type);
 
+#ifdef HAVE_SSL
 static void safe_hexchar(unsigned char c, char *buff, char **bp);
+#endif /* HAVE_SSL */
 
 static bool
 encode_base64
@@ -376,6 +378,7 @@ FUNCTION(fun_digest)
 #endif
 }
 
+#ifdef HAVE_SSL
 static void
 safe_hexchar(unsigned char c, char *buff, char **bp)
 {
@@ -389,3 +392,4 @@ safe_hexchar(unsigned char c, char *buff, char **bp)
     (*bp)++;
   }
 }
+#endif

diff --git a/src/fundiv.c b/src/fundiv.c
index 67a7912759612cbd07eb329ae7e6258f6854f838..4b73a02247270e19115c9579c3b64cf50eb6cfa1 100644 (file)
--- a/src/fundiv.c
+++ b/src/fundiv.c
@@ -3,11 +3,8 @@
 #include "copyrite.h"
 
 #include "config.h"
-#ifdef I_STRING
 #include <string.h>
-#else
 #include <strings.h>
-#endif
 #include "conf.h"
 #include "externs.h"
 #include "division.h"