* clean up warnings, especialy on 64 bit

diff --git a/webcit/configure.ac b/webcit/configure.ac
index 5fe05bc1fd5e5dd2a6931a7769245ca044135280..56aa70347f4fafd19f0937b93a8c2e73521ad3fb 100644 (file)
--- a/webcit/configure.ac
+++ b/webcit/configure.ac
@@ -122,6 +122,13 @@ dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_TYPE_OFF_T
 AC_TYPE_SIZE_T
+dnl Check the size of various builtin types; see typesize.h (error)
+AC_CHECK_SIZEOF(char, 0)
+AC_CHECK_SIZEOF(short, 0)
+AC_CHECK_SIZEOF(int, 0)
+AC_CHECK_SIZEOF(long, 0)
+AC_CHECK_SIZEOF(long unsigned int, 0)
+AC_CHECK_SIZEOF(size_t, 0)
 dnl AC_HEADER_TIME
 
 dnl Checks for library functions.

diff --git a/webcit/ical_subst.c b/webcit/ical_subst.c
index 4693786cb9da70d949e6a027a1b8a3a361c6448f..5d6259d88dd81bcdc51b2f45b8a091a1a1767670 100644 (file)
--- a/webcit/ical_subst.c
+++ b/webcit/ical_subst.c
@@ -58,7 +58,7 @@ void SortPregetMatter(HashList *Cals)
                while ((SortMap[i] != NULL) && 
                       (Cal->SortBy != NULL)) 
                {
-                       Cal->SortBy = icalcomponent_get_first_property(Cal->SortBy, SortMap[i++]->map);
+                       /****Cal->SortBy = icalcomponent_get_first_property(Cal->SortBy, SortMap[i++]->map); */
                }
        }
        

diff --git a/webcit/tcp_sockets.c b/webcit/tcp_sockets.c
index ba4cac55697a6d2df4dbc247d612c89239967e73..b73823a58f70de86726abe77b403dac1805b8a93 100644 (file)
--- a/webcit/tcp_sockets.c
+++ b/webcit/tcp_sockets.c
@@ -329,7 +329,7 @@ int serv_read_binary(StrBuf *Ret, size_t total_len, StrBuf *Buf)
 
        if (MaxRead == -1)
        {
-               serv_printf("READ %d|%d", 0, total_len);
+               serv_printf("READ %d|"SIZE_T_FMT, 0, total_len);
                if (StrBuf_ServGetln(Buf) > 0)
                {
                        long YetRead;

diff --git a/webcit/webcit.h b/webcit/webcit.h
index 8fab4872190e3e14af7c21175447c86cab3d30be..2f1e04873b5a7c616a8933fef35f9d718c6e6725 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -114,6 +114,17 @@ extern char *ssl_cipher_list;
 #define        DEFAULT_SSL_CIPHER_LIST "DEFAULT"       /* See http://openssl.org/docs/apps/ciphers.html */
 #endif
 
+#if SIZEOF_SIZE_T == SIZEOF_INT 
+#define SIZE_T_FMT "%d"
+#else
+#define SIZE_T_FMT "%ld"
+#endif
+
+#if SIZEOF_LONG_UNSIGNED_INT == SIZEOF_INT
+#define ULONG_FMT "%d"
+#else
+#define ULONG_FMT "%ld"
+#endif
 
 #define CALENDAR_ROOM_NAME     "Calendar"
 #define PRODID "-//Citadel//NONSGML Citadel Calendar//EN"