Support building on Zeta with BeIDE or make.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20942 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
d1c710a7d8
commit
f57432d8c2
@ -74,8 +74,11 @@ GraphicsDriver::setupData(BFile *spool_file)
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifndef __ZETA__
|
||||||
print_file_header pfh;
|
print_file_header pfh;
|
||||||
|
#else
|
||||||
|
BPrintJob::print_file_header pfh;
|
||||||
|
#endif
|
||||||
spool_file->Seek(0, SEEK_SET);
|
spool_file->Seek(0, SEEK_SET);
|
||||||
spool_file->Read(&pfh, sizeof(pfh));
|
spool_file->Read(&pfh, sizeof(pfh));
|
||||||
|
|
||||||
|
@ -28,6 +28,7 @@ THE SOFTWARE.
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
#include <Picture.h>
|
||||||
#include <PrintJob.h>
|
#include <PrintJob.h>
|
||||||
#include "PrintJobReader.h"
|
#include "PrintJobReader.h"
|
||||||
|
|
||||||
@ -103,7 +104,11 @@ PrintJobReader::PrintJobReader(BFile* jobFile)
|
|||||||
, fNumberOfPages(-1)
|
, fNumberOfPages(-1)
|
||||||
, fPageIndex(NULL)
|
, fPageIndex(NULL)
|
||||||
{
|
{
|
||||||
|
#ifndef __ZETA__
|
||||||
print_file_header header;
|
print_file_header header;
|
||||||
|
#else
|
||||||
|
BPrintJob::print_file_header header;
|
||||||
|
#endif
|
||||||
fJobFile.Seek(0, SEEK_SET);
|
fJobFile.Seek(0, SEEK_SET);
|
||||||
if (fJobFile.Read(&header, sizeof(header)) == sizeof(header) &&
|
if (fJobFile.Read(&header, sizeof(header)) == sizeof(header) &&
|
||||||
fJobSettings.Unflatten(&fJobFile) == B_OK) {
|
fJobSettings.Unflatten(&fJobFile) == B_OK) {
|
||||||
|
@ -103,7 +103,11 @@ static bool InList(const char* list[], const char* name) {
|
|||||||
|
|
||||||
void AddFields(BMessage* to, const BMessage* from, const char* excludeList[], const char* includeList[], bool overwrite) {
|
void AddFields(BMessage* to, const BMessage* from, const char* excludeList[], const char* includeList[], bool overwrite) {
|
||||||
if (to == from) return;
|
if (to == from) return;
|
||||||
|
#ifndef __ZETA__
|
||||||
char* name;
|
char* name;
|
||||||
|
#else
|
||||||
|
const char* name;
|
||||||
|
#endif
|
||||||
type_code type;
|
type_code type;
|
||||||
int32 count;
|
int32 count;
|
||||||
for (int32 i = 0; from->GetInfo(B_ANY_TYPE, i, &name, &type, &count) == B_OK; i ++) {
|
for (int32 i = 0; from->GetInfo(B_ANY_TYPE, i, &name, &type, &count) == B_OK; i ++) {
|
||||||
|
Loading…
Reference in New Issue
Block a user