From bbfba95c88d7d25ebada483475433b9067721c09 Mon Sep 17 00:00:00 2001 From: padraic Date: Thu, 21 Apr 2011 14:20:59 -0400 Subject: [PATCH] More Build Fixes IssueID #240 --- hdrs/parse.h | 4 ++-- src/cron.c | 2 -- src/db.c | 3 ++- src/funcrypt.c | 4 ++++ src/fundiv.c | 3 --- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hdrs/parse.h b/hdrs/parse.h index 93c2b29..6dd83bd 100644 --- 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 3271961..35e6b8f 100644 --- a/src/cron.c +++ b/src/cron.c @@ -19,9 +19,7 @@ #include "cron.h" #include -#ifdef I_STRING #include -#endif #ifdef MUSHCRON diff --git a/src/db.c b/src/db.c index 360a5f5..382d64e 100644 --- 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 82e3280..2334ac5 100644 --- 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 67a7912..4b73a02 100644 --- a/src/fundiv.c +++ b/src/fundiv.c @@ -3,11 +3,8 @@ #include "copyrite.h" #include "config.h" -#ifdef I_STRING #include -#else #include -#endif #include "conf.h" #include "externs.h" #include "division.h" -- 2.30.2