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

Revert "Fixes to allow compilation on F14"

Browse Source 
This reverts commit 91bc81afee.

Apparently we must build the installer on F13, and this
fix is incompatible with F13... Sigh...
This commit is contained in:
Joanna Rutkowska 2011-04-02 16:07:44 +02:00
parent 94ec336025
commit d31022937e
3 changed files with 3 additions and 4 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.label = label;
rc = mediaCheckFile(file, progressCallback, (void*)&data);
rc = mediaCheckFile(file, progressCallback, &data);
newtFormDestroy(f);
newtPopWindow();

3
anaconda/loader/windows.c
View File

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

2
anaconda/loader/windows.h
View File

@ -37,7 +37,7 @@ struct progressCBdata {
newtComponent label;
};
int progressCallback(void *pbdata, long long pos, long long total);
void progressCallback(void *pbdata, long long pos, long long total);
struct progressCBdata *winProgressBar(int width, int height, char *title, char *text, ...);
#endif /* _WINDOWS_H_ */