mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-05 22:48:55 +02:00
95 lines
2.5 KiB
Plaintext
95 lines
2.5 KiB
Plaintext
From 0c0e500f1ef9a22ed62ed28cd74905b1704722c7 Mon Sep 17 00:00:00 2001
|
|
From: Jerome Duval <jerome.duval@gmail.com>
|
|
Date: Thu, 8 May 2014 16:34:31 +0000
|
|
Subject: undef PAGESIZE on HAIKU
|
|
|
|
* gcc2 build fix on pixma_parse.c
|
|
|
|
diff --git a/src/testpattern/testpattern.c b/src/testpattern/testpattern.c
|
|
index 624d7d6..6ac0fe9 100644
|
|
--- a/src/testpattern/testpattern.c
|
|
+++ b/src/testpattern/testpattern.c
|
|
@@ -38,6 +38,9 @@
|
|
#include <stdio.h>
|
|
#include <math.h>
|
|
#include <string.h>
|
|
+#ifdef __HAIKU__
|
|
+#undef PAGESIZE
|
|
+#endif
|
|
#include "testpattern.h"
|
|
#include <gutenprint/gutenprint-intl.h>
|
|
#include <errno.h>
|
|
diff --git a/src/testpattern/testpatternl.c b/src/testpattern/testpatternl.c
|
|
index e8ec86b..9953d25 100644
|
|
--- a/src/testpattern/testpatternl.c
|
|
+++ b/src/testpattern/testpatternl.c
|
|
@@ -20,6 +20,9 @@
|
|
#include <string.h>
|
|
#include <errno.h>
|
|
#include <stdlib.h>
|
|
+#ifdef __HAIKU__
|
|
+#undef PAGESIZE
|
|
+#endif
|
|
|
|
/* end standard C headers. */
|
|
|
|
diff --git a/src/testpattern/testpatternl.l b/src/testpattern/testpatternl.l
|
|
index 16cb38c..bf164e4 100644
|
|
--- a/src/testpattern/testpatternl.l
|
|
+++ b/src/testpattern/testpatternl.l
|
|
@@ -29,6 +29,9 @@
|
|
#include <string.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
+#ifdef __HAIKU__
|
|
+#undef PAGESIZE
|
|
+#endif
|
|
#include "testpattern.h"
|
|
|
|
#define YY_NO_UNPUT
|
|
diff --git a/src/testpattern/testpatterny.c b/src/testpattern/testpatterny.c
|
|
index 818087e..ea0e141 100644
|
|
--- a/src/testpattern/testpatterny.c
|
|
+++ b/src/testpattern/testpatterny.c
|
|
@@ -78,6 +78,9 @@
|
|
#include <string.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
+#ifdef __HAIKU__
|
|
+#undef PAGESIZE
|
|
+#endif
|
|
#include "testpattern.h"
|
|
|
|
extern int mylineno;
|
|
diff --git a/src/testpattern/testpatterny.y b/src/testpattern/testpatterny.y
|
|
index 229109a..6c6e8f8 100644
|
|
--- a/src/testpattern/testpatterny.y
|
|
+++ b/src/testpattern/testpatterny.y
|
|
@@ -29,6 +29,9 @@
|
|
#include <string.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
+#ifdef __HAIKU__
|
|
+#undef PAGESIZE
|
|
+#endif
|
|
#include "testpattern.h"
|
|
|
|
extern int mylineno;
|
|
diff --git a/test/pixma_parse.c b/test/pixma_parse.c
|
|
index 0fc368b..d5f23f8 100644
|
|
--- a/test/pixma_parse.c
|
|
+++ b/test/pixma_parse.c
|
|
@@ -638,8 +638,8 @@ static int process(FILE* in, FILE* out,int verbose,unsigned int maxw,unsigned in
|
|
|
|
|
|
}else if(buf[0]==0x1 && buf[1]==0x0 && buf[2]==0x1){
|
|
- fprintf(stderr," 1bit-per pixel\n");
|
|
int num_colors = cnt*3; /*no idea yet! 3 for iP4000 */
|
|
+ fprintf(stderr," 1bit-per pixel\n");
|
|
/*num_colors=9;*/
|
|
/*for(i=0;i<MAX_COLORS;i++){*/
|
|
for(i=0;i<num_colors;i++){
|
|
--
|
|
1.8.3.4
|
|
|