From 91bc81afee9f121431d85f8ca8c3dc7e9196594e Mon Sep 17 00:00:00 2001
From: Joanna Rutkowska <joanna@invisiblethingslab.com>
Date: Fri, 1 Apr 2011 15:08:07 +0200
Subject: [PATCH] Fixes to allow compilation on F14

---
 anaconda/loader/mediacheck.c | 2 +-
 anaconda/loader/windows.c    | 3 ++-
 anaconda/loader/windows.h    | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/anaconda/loader/mediacheck.c b/anaconda/loader/mediacheck.c
index 6e96647..3ee592c 100644
--- a/anaconda/loader/mediacheck.c
+++ b/anaconda/loader/mediacheck.c
@@ -75,7 +75,7 @@ int doMediaCheck(char *file, char *descr) {
     data.scale = scale;
     data.label = label;
 
-    rc = mediaCheckFile(file, progressCallback, &data);
+    rc = mediaCheckFile(file, progressCallback, (void*)&data);
 
     newtFormDestroy(f);
     newtPopWindow();
diff --git a/anaconda/loader/windows.c b/anaconda/loader/windows.c
index 3d57136..1c7e144 100644
--- a/anaconda/loader/windows.c
+++ b/anaconda/loader/windows.c
@@ -66,7 +66,7 @@ void scsiWindow(const char * driver) {
         _("Loading %s driver"), driver);
 }
 
-void progressCallback(void *pbdata, long long pos, long long total) {
+int progressCallback(void *pbdata, long long pos, long long total) {
     struct progressCBdata *data = pbdata;
     char tickmark[2] = "-";
     char *ticks = "-\\|/";
@@ -77,6 +77,7 @@ void progressCallback(void *pbdata, long long pos, long long total) {
 
     newtLabelSetText(data->label, tickmark);
     newtRefresh();
+    return 0;
 }
 
 struct progressCBdata *winProgressBar(int width, int height, char *title, char *text, ...) {
diff --git a/anaconda/loader/windows.h b/anaconda/loader/windows.h
index f635102..a1646d4 100644
--- a/anaconda/loader/windows.h
+++ b/anaconda/loader/windows.h
@@ -37,7 +37,7 @@ struct progressCBdata {
     newtComponent label;
 };
 
-void progressCallback(void *pbdata, long long pos, long long total);
+int progressCallback(void *pbdata, long long pos, long long total);
 struct progressCBdata *winProgressBar(int width, int height, char *title, char *text, ...);
 
 #endif /* _WINDOWS_H_ */