QubesOS/qubes-installer-qubes-os
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixes to allow compilation on F14

Browse Source
This commit is contained in:
Joanna Rutkowska 2011-04-01 15:08:07 +02:00
parent 1b6731f8fe
commit 91bc81afee
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
anaconda/loader/mediacheck.c
View File

@ -75,7 +75,7 @@ int doMediaCheck(char *file, char *descr) {
data.scale = scale; data.scale = scale;
data.label = label; data.label = label;
rc = mediaCheckFile(file, progressCallback, &data); rc = mediaCheckFile(file, progressCallback, (void*)&data);
newtFormDestroy(f); newtFormDestroy(f);
newtPopWindow(); newtPopWindow();

3
anaconda/loader/windows.c
View File

@ -66,7 +66,7 @@ void scsiWindow(const char * driver) {
_("Loading %s driver"), 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; struct progressCBdata *data = pbdata;
char tickmark[2] = "-"; char tickmark[2] = "-";
char *ticks = "-\\|/"; char *ticks = "-\\|/";
@ -77,6 +77,7 @@ void progressCallback(void *pbdata, long long pos, long long total) {
newtLabelSetText(data->label, tickmark); newtLabelSetText(data->label, tickmark);
newtRefresh(); newtRefresh();
return 0;
} }
struct progressCBdata *winProgressBar(int width, int height, char *title, char *text, ...) { struct progressCBdata *winProgressBar(int width, int height, char *title, char *text, ...) {

2
anaconda/loader/windows.h
View File

@ -37,7 +37,7 @@ struct progressCBdata {
newtComponent label; 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, ...); struct progressCBdata *winProgressBar(int width, int height, char *title, char *text, ...);
#endif /* _WINDOWS_H_ */ #endif /* _WINDOWS_H_ */