diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2016-05-13 19:36:51 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2016-05-13 19:36:51 +0000 |
| commit | 36212b99fc20b0661e77e17f89a95b702f21eace (patch) | |
| tree | 7e9bb044e79364cec7a4c2a7dde88c47ae69b91f /math/xgraph/files/patch-xgraph.c | |
| parent | Prevent collision on getline(3) (diff) | |
Prevent collision with getline(3)
While here regen patches
Notes
Notes:
svn path=/head/; revision=415142
Diffstat (limited to 'math/xgraph/files/patch-xgraph.c')
| -rw-r--r-- | math/xgraph/files/patch-xgraph.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/math/xgraph/files/patch-xgraph.c b/math/xgraph/files/patch-xgraph.c index 5e029d2e214b..9a6e89787a7b 100644 --- a/math/xgraph/files/patch-xgraph.c +++ b/math/xgraph/files/patch-xgraph.c @@ -1,6 +1,6 @@ ---- xgraph.c 2000-09-10 07:05:47.000000000 -0700 -+++ xgraph.c 2014-12-15 22:32:58.000000000 -0800 -@@ -74,8 +74,6 @@ +--- xgraph.c.orig 2000-09-10 14:05:47 UTC ++++ xgraph.c +@@ -74,8 +74,6 @@ #define BTNPAD 1 #define BTNINTER 3 @@ -9,7 +9,7 @@ #define ABS(x) ((x) < 0 ? -(x) : (x)) #define ZERO_THRES 1.0E-07 -@@ -333,6 +331,7 @@ +@@ -333,6 +331,7 @@ char *argv[]; if (!strm) { (void) fprintf(stderr, "Warning: cannot open file `%s'\n", inFileNames[idx]); @@ -17,7 +17,7 @@ } else { if ((maxitems = ReadData(strm, inFileNames[idx])) < 0) { errs++; -@@ -403,6 +402,7 @@ +@@ -403,6 +402,7 @@ char *argv[]; fg_color = PM_COLOR("Foreground"); bg_color = PM_COLOR("Background"); XRecolorCursor(disp, zoomCursor, &fg_color, &bg_color); @@ -25,7 +25,7 @@ Num_Windows = 1; while (Num_Windows > 0) { -@@ -415,6 +415,12 @@ +@@ -415,6 +415,12 @@ char *argv[]; continue; } switch (theEvent.type) { @@ -38,7 +38,7 @@ case Expose: if (theEvent.xexpose.count <= 0) { XWindowAttributes win_attr; -@@ -422,7 +428,7 @@ +@@ -422,7 +428,7 @@ char *argv[]; XGetWindowAttributes(disp, theEvent.xany.window, &win_attr); win_info->dev_info.area_w = win_attr.width; win_info->dev_info.area_h = win_attr.height; @@ -47,7 +47,7 @@ DrawWindow(win_info); } break; -@@ -715,7 +721,7 @@ +@@ -715,7 +721,7 @@ int primary; /* Is this the primary wi if (sizehints.x<0) sizehints.x = 0; sizehints.y += 25; } @@ -56,7 +56,7 @@ /* Aspect ratio computation */ if (asp < 1.0) { -@@ -723,6 +729,7 @@ +@@ -723,6 +729,7 @@ int primary; /* Is this the primary wi } else { height = ((int) (((double) NORMSIZE) / asp)); } @@ -64,7 +64,7 @@ height = MAX(MINDIM, height); width = MAX(MINDIM, width); -@@ -789,7 +796,7 @@ +@@ -789,7 +796,7 @@ int primary; /* Is this the primary wi new_info->flags = 0; XSelectInput(disp, new_window, @@ -73,7 +73,7 @@ if (!theCursor) { theCursor = XCreateFontCursor(disp, XC_top_left_arrow); fg_color = PM_COLOR("Foreground"); -@@ -1478,6 +1485,8 @@ +@@ -1478,6 +1485,8 @@ LineInfo *result; /* Returned result */ while (*line && (*line != '\n') && (*line != '"')) line++; if (*line) *line = '\0'; } else { |