Fix build with gcc 4.1
Submitter of the PR [1] noticed that the port is not completely fixed after my first commit to it. PR: ports/94461 [1] Submitted by: Ron MacNeil <macro@hotmail.com>
This commit is contained in:
parent
1af5f4ff10
commit
68a02799cd
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=165387
1 changed files with 18 additions and 17 deletions
|
@ -1,6 +1,6 @@
|
|||
--- lips/gdevl4v.c.orig Thu Nov 2 12:09:18 2000
|
||||
+++ lips/gdevl4v.c Tue Jan 13 01:30:38 2004
|
||||
@@ -230,41 +230,66 @@
|
||||
--- lips/gdevl4v.c.orig Thu Nov 2 05:09:18 2000
|
||||
+++ lips/gdevl4v.c Sun Jun 11 15:57:43 2006
|
||||
@@ -230,41 +230,67 @@
|
||||
};
|
||||
|
||||
/* Vector device implementation */
|
||||
|
@ -24,26 +24,26 @@
|
|||
+private int
|
||||
+lips4v_setlogop(gx_device_vector * vdev, gs_logical_operation_t lop,
|
||||
+ gs_logical_operation_t diff);
|
||||
private int
|
||||
-lips4v_setlogop(P3
|
||||
|
||||
- (gx_device_vector * vdev, gs_logical_operation_t lop,
|
||||
- gs_logical_operation_t diff));
|
||||
+private int
|
||||
+
|
||||
+lips4v_beginpath(gx_device_vector * vdev, gx_path_type_t type);
|
||||
+private int
|
||||
+lips4v_moveto(gx_device_vector * vdev, floatp x0, floatp y0, floatp x,
|
||||
+ floatp y, gx_path_type_t type);
|
||||
private int
|
||||
+private int
|
||||
+lips4v_lineto(gx_device_vector * vdev, floatp x0, floatp y0, floatp x,
|
||||
+ floatp y, gx_path_type_t type);
|
||||
+private int
|
||||
private int
|
||||
-lips4v_setlogop(P3
|
||||
+lips4v_curveto(gx_device_vector * vdev, floatp x0, floatp y0, floatp x1,
|
||||
+ floatp y1, floatp x2, floatp y2, floatp x3, floatp y3,
|
||||
+ gx_path_type_t type);
|
||||
+private int
|
||||
+lips4v_closepath(gx_device_vector * vdev, floatp x, floatp y, floatp x_start,
|
||||
+ floatp y_start, gx_path_type_t type);
|
||||
|
||||
-lips4v_beginpath(P2(gx_device_vector * vdev, gx_path_type_t type));
|
||||
- (gx_device_vector * vdev, gs_logical_operation_t lop,
|
||||
- gs_logical_operation_t diff));
|
||||
+private int lips4v_endpath(gx_device_vector * vdev, gx_path_type_t type);
|
||||
+#else
|
||||
+private int lips4v_beginpage(P1(gx_device_vector * vdev));
|
||||
|
@ -57,8 +57,9 @@
|
|||
+private int
|
||||
+lips4v_setlogop(gx_device_vector * vdev, gs_logical_operation_t lop,
|
||||
+ gs_logical_operation_t diff);
|
||||
+private int
|
||||
+
|
||||
private int
|
||||
|
||||
-lips4v_beginpath(P2(gx_device_vector * vdev, gx_path_type_t type));
|
||||
+lips4v_beginpath(gx_device_vector * vdev, gx_path_type_t type);
|
||||
private int
|
||||
-lips4v_moveto(P6
|
||||
|
@ -92,7 +93,7 @@
|
|||
private int lips4v_setlinewidth(gx_device_vector * vdev, floatp width);
|
||||
private int lips4v_setlinecap(gx_device_vector * vdev, gs_line_cap cap);
|
||||
private int lips4v_setlinejoin(gx_device_vector * vdev, gs_line_join join);
|
||||
@@ -758,10 +783,26 @@
|
||||
@@ -758,10 +784,26 @@
|
||||
/* Íѻ極¥¤¥º */
|
||||
if (pdev->prev_paper_size != paper_size) {
|
||||
if (paper_size == USER_SIZE) {
|
||||
|
@ -121,7 +122,7 @@
|
|||
lputs(s, paper);
|
||||
} else {
|
||||
sprintf(paper, "%c%dp", LIPS_CSI, paper_size);
|
||||
@@ -770,12 +811,28 @@
|
||||
@@ -770,12 +812,28 @@
|
||||
} else if (paper_size == USER_SIZE) {
|
||||
if (pdev->prev_paper_width != width ||
|
||||
pdev->prev_paper_height != height)
|
||||
|
@ -152,7 +153,7 @@
|
|||
lputs(s, paper);
|
||||
}
|
||||
pdev->prev_paper_size = paper_size;
|
||||
@@ -1881,7 +1938,7 @@
|
||||
@@ -1881,7 +1939,7 @@
|
||||
}
|
||||
color_set_pure(&color, one);
|
||||
code = gdev_vector_update_fill_color((gx_device_vector *) pdev,
|
||||
|
@ -161,7 +162,7 @@
|
|||
}
|
||||
if (code < 0)
|
||||
return 0;
|
||||
@@ -2026,7 +2083,7 @@
|
||||
@@ -2026,7 +2084,7 @@
|
||||
if (w <= 0 || h <= 0)
|
||||
return 0;
|
||||
if (depth > 1 ||
|
||||
|
|
Loading…
Reference in a new issue