Fix conflict with POSIX getline; fix LP64 issues found by gcc.


(dholland)

$NetBSD: patch-dialog_c,v 1.1 2011/10/03 01:45:22 dholland Exp $

- fix conflict with POSIX getline

--- dialog.c~	1998-05-22 12:19:06.000000000 +0000
+++ dialog.c
@@ -32,7 +32,7 @@ static short gray_bits[] = {
 
 static void make_msg_box();
 static void del_msg_box();
-static int getline();
+static int get_line(char **, char *);
 
 
 #define D_VPAD	2
@@ -702,7 +702,7 @@ xtb_frame *frame;		/* Returned frame */
     new_info->lines = (Window *) malloc((unsigned) (sizeof(Window) * E_LINES));
 
     lineptr = text;
-    while (getline(&lineptr, line)) {
+    while (get_line(&lineptr, line)) {
 	if (new_info->num_lines >= new_info->alloc_lines) {
 	    new_info->alloc_lines *= 2;
 	    new_info->lines = (Window *) realloc((char *) new_info->lines,
@@ -800,7 +800,7 @@ char *err_text;
 
 
 
-static int getline(tptr, lptr)
+static int get_line(tptr, lptr)
 char **tptr;
 char *lptr;
 /*

$NetBSD: patch-st_c,v 1.1 2011/10/03 01:45:22 dholland Exp $

- Fix LP64 issues.

--- st.c.orig	1998-05-22 12:27:04.000000000 +0000
+++ st.c
@@ -11,6 +11,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include "copyright.h"
 
 #include "st.h"
@@ -21,9 +22,9 @@
 #define alloc(type) (type *) malloc(sizeof(type))
 
 #define ABS(x) ((x) < 0 ? -(x) : (x))
-#define ST_NUMCMP(x,y) ((int) (x) - (int) (y))
-#define ST_NUMHASH(x,size) (ABS((int)x)%(size))
-#define ST_PTRHASH(x,size) ((int)((unsigned)(x)>>2)%size)
+#define ST_NUMCMP(x,y) ((intptr_t) (x) - (intptr_t) (y))
+#define ST_NUMHASH(x,size) (ABS((intptr_t)x)%(size))
+#define ST_PTRHASH(x,size) ((intptr_t)((uintptr_t)(x)>>2)%size)
 #define EQUAL(func, x, y) \
     ((((func) == st_numcmp) || ((func) == st_ptrcmp)) ?\
       (ST_NUMCMP((x),(y)) == 0) : ((*func)((x), (y)) == 0))