--- libaitsync/src/dir.c	2010/09/20 23:07:57	1.1.2.2
+++ libaitsync/src/dir.c	2011/05/08 00:49:45	1.1.2.5
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: dir.c,v 1.1.2.2 2010/09/20 23:07:57 misho Exp $
+* $Id: dir.c,v 1.1.2.5 2011/05/08 00:49:45 misho Exp $
 *
 *************************************************************************/
 #include "global.h"
@@ -111,7 +111,11 @@ create_diridx(const char *csDir, int lm, int *tags, st
 		if (lm & 1) {
 			if (lstat(d.d_name, &sb) != -1) {
 				memset(szStr, 0, STRSIZ);
+#if defined(__OpenBSD__)
 				strftime(szStr, STRSIZ, "%Y-%m-%d %H:%M:%S", localtime((time_t*) &sb.st_mtim));
+#else
+				strftime(szStr, STRSIZ, "%Y-%m-%d %H:%M:%S", localtime((time_t*) &sb.st_mtime));
+#endif
 				switch (d.d_type) {
 					case DT_FIFO:
 						strlcpy(szType, "fifo", STRSIZ);
@@ -134,15 +138,18 @@ create_diridx(const char *csDir, int lm, int *tags, st
 					case DT_SOCK:
 						strlcpy(szType, "socket", STRSIZ);
 						break;
+/* OpenBSD does not have this type */
+#ifdef DT_WHT
 					case DT_WHT:
 						strlcpy(szType, "wht", STRSIZ);
 						break;
+#endif
 					case DT_UNKNOWN:
 					default:
 						strlcpy(szType, "unknown", STRSIZ);
 						break;
 				}
-				snprintf(l[n].extra, STRSIZ, "%s links=%d inode=%u %d:%d perm=0%o size=%llu %s", 
+				snprintf(l[n].extra, STRSIZ, "%s links=%d inode=%lu %d:%d perm=0%o size=%ld %s", 
 						szType, sb.st_nlink, sb.st_ino, sb.st_uid, sb.st_gid, 
 						sb.st_mode & 0x1fff, sb.st_size, szStr);
 			}
@@ -320,8 +327,13 @@ sync_dircmpList(const char *csDir1, const char *csDir2
 				if (lm & 1) {
 					if (lstat(d.d_name, &sb) != -1) {
 						memset(szStr, 0, STRSIZ);
+#if defined(__OpenBSD__)
 						strftime(szStr, STRSIZ, "%Y-%m-%d %H:%M:%S", 
 								localtime((time_t*) &sb.st_mtim));
+#else
+						strftime(szStr, STRSIZ, "%Y-%m-%d %H:%M:%S", 
+								localtime((time_t*) &sb.st_mtime));
+#endif
 						switch (d.d_type) {
 							case DT_FIFO:
 								strlcpy(szType, "fifo", STRSIZ);
@@ -344,16 +356,19 @@ sync_dircmpList(const char *csDir1, const char *csDir2
 							case DT_SOCK:
 								strlcpy(szType, "socket", STRSIZ);
 								break;
+/* OpenBSD does not have this type */
+#ifdef DT_WHT
 							case DT_WHT:
 								strlcpy(szType, "wht", STRSIZ);
 								break;
+#endif
 							case DT_UNKNOWN:
 							default:
 								strlcpy(szType, "unknown", STRSIZ);
 								break;
 						}
 						snprintf(l[n].extra, STRSIZ, 
-								"%s links=%d inode=%u %d:%d perm=0%o size=%llu %s", 
+								"%s links=%d inode=%lu %d:%d perm=0%o size=%ld %s", 
 								szType, sb.st_nlink, sb.st_ino, sb.st_uid, sb.st_gid, 
 								sb.st_mode & 0x1fff, sb.st_size, szStr);
 					}