diff --git a/src/rrd_open.c b/src/rrd_open.c
index 5c5b0f9e34c12640361651cb455e96b194d78b85..6ef3596b6f69518f73298856b11d85d8a734429b 100644 (file)
--- a/src/rrd_open.c
+++ b/src/rrd_open.c
/*****************************************************************************
- * RRDtool 1.3.7 Copyright by Tobi Oetiker, 1997-2009
+ * RRDtool 1.3.8 Copyright by Tobi Oetiker, 1997-2009
*****************************************************************************
* rrd_open.c Open an RRD File
*****************************************************************************
#include <stdlib.h>
#include <fcntl.h>
#include <sys/stat.h>
+#endif
+
+#ifdef HAVE_BROKEN_MS_ASYNC
+#include <sys/types.h>
#include <utime.h>
#endif
#ifdef USE_MADVISE
if (rdwr & RRD_COPY) {
/* We will read everything in a moment (copying) */
- madvise(data, rrd_file->file_len, MADV_WILLNEED | MADV_SEQUENTIAL);
+ madvise(data, rrd_file->file_len, MADV_WILLNEED);
+ madvise(data, rrd_file->file_len, MADV_SEQUENTIAL);
} else {
/* We do not need to read anything in for the moment */
madvise(data, rrd_file->file_len, MADV_RANDOM);
/* the stat_head will be needed soonish, so hint accordingly */
- madvise(data, sizeof(stat_head_t), MADV_WILLNEED | MADV_RANDOM);
+ madvise(data, sizeof(stat_head_t), MADV_WILLNEED);
+ madvise(data, sizeof(stat_head_t), MADV_RANDOM);
}
#endif
for (i=0; i<rrd->stat_head->rra_cnt; i++)
row_cnt += rrd->rra_def[i].row_cnt;
- off_t correct_len = rrd_file->header_len +
+ size_t correct_len = rrd_file->header_len +
sizeof(rrd_value_t) * row_cnt * rrd->stat_head->ds_cnt;
if (correct_len > rrd_file->file_len)
rrd_t *rrd)
{
#if defined USE_MADVISE || defined HAVE_POSIX_FADVISE
- unsigned long dontneed_start;
- unsigned long rra_start;
- unsigned long active_block;
- unsigned long i;
+ size_t dontneed_start;
+ size_t rra_start;
+ size_t active_block;
+ size_t i;
ssize_t _page_size = sysconf(_SC_PAGESIZE);
if (rrd_file == NULL) {