summaryrefslogtreecommitdiff
path: root/lib_generic
diff options
context:
space:
mode:
authorGrant Erickson <gerickson@nuovations.com>2008-05-06 16:18:00 -0700
committerWolfgang Denk <wd@denx.de>2008-05-09 23:04:41 +0200
commitf3b6d528e4dd719640a4bfcd954f4e4c7f5db0d6 (patch)
tree03337ee79651b01b5bb57b0c3bacf29f6491d915 /lib_generic
parent7ea8325b41e02bf0a84ef3eafa686730886977a8 (diff)
Fix Compilation Errors with 'tools/env/fw_printenv'
In the current top-of-tree, 1.3.3.-rc2, the optional tool 'tools/env/fw_printenv' fails to compile for two reasons: 1) The header watchdog.h cannot be found. 2) The header zlib.h is picked up from the tool chain rather than the project causing a prototype conflict for crc32. This patch addresses both of these issues. Platforms Tested On: - AMCC "Kilauea" Signed-off-by: Grant Erickson <gerickson@nuovations.com>
Diffstat (limited to 'lib_generic')
-rw-r--r--lib_generic/crc32.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib_generic/crc32.c b/lib_generic/crc32.c
index 64f66ed6fb1..83d1d1d3a0d 100644
--- a/lib_generic/crc32.c
+++ b/lib_generic/crc32.c
@@ -14,7 +14,9 @@
#include <stdint.h>
#endif
+#if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)
#include <watchdog.h>
+#endif
#include "zlib.h"
#define local static