Revert "Fixes to allow compilation on F14"

This reverts commit 91bc81afee.

Apparently we must build the installer on F13, and this
fix is incompatible with F13... Sigh...
release2 j_d310229
Joanna Rutkowska 13 years ago
parent 94ec336025
commit d31022937e

@ -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();

@ -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, ...) {

@ -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_ */

Loading…
Cancel
Save