From 202ade1398ca57070e56de24c3639f3048ecd784 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Fri, 15 Apr 2011 18:40:32 -0500
Subject: Include "config.h" in header files using off_t
This makes it absolutely dead easy to ensure off_t has the same length
in all compilation units. I just spent 2.5 hours bashing my head on an
issue related to this so damn it I'm fixing it for good.
Signed-off-by: Dan McGee <dan@archlinux.org>
---
lib/libalpm/delta.h | 6 ++++--
lib/libalpm/graph.h | 2 ++
lib/libalpm/package.h | 2 ++
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/lib/libalpm/delta.h b/lib/libalpm/delta.h
index d7a81c47..bd196bab 100644
--- a/lib/libalpm/delta.h
+++ b/lib/libalpm/delta.h
@@ -20,6 +20,8 @@
#ifndef _ALPM_DELTA_H
#define _ALPM_DELTA_H
+#include "config.h" /* ensure off_t is correct length */
+
#include <sys/types.h> /* off_t */
#include "alpm.h"
@@ -29,12 +31,12 @@ struct __pmdelta_t {
char *delta;
/** md5sum of the delta file */
char *delta_md5;
- /** filesize of the delta file */
- off_t delta_size;
/** filename of the 'before' file */
char *from;
/** filename of the 'after' file */
char *to;
+ /** filesize of the delta file */
+ off_t delta_size;
/** download filesize of the delta file */
off_t download_size;
};
diff --git a/lib/libalpm/graph.h b/lib/libalpm/graph.h
index ff458230..f76c6004 100644
--- a/lib/libalpm/graph.h
+++ b/lib/libalpm/graph.h
@@ -19,6 +19,8 @@
#ifndef _ALPM_GRAPH_H
#define _ALPM_GRAPH_H
+#include "config.h" /* ensure off_t is correct length */
+
#include <sys/types.h> /* off_t */
#include "alpm_list.h"
diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h
index 35e4500d..c84e2221 100644
--- a/lib/libalpm/package.h
+++ b/lib/libalpm/package.h
@@ -24,6 +24,8 @@
#ifndef _ALPM_PACKAGE_H
#define _ALPM_PACKAGE_H
+#include "config.h" /* ensure off_t is correct length */
+
#include <sys/types.h> /* off_t */
#include <time.h> /* time_t */
--
cgit v1.2.3-70-g09d2