40 lines
1.1 KiB
Plaintext
40 lines
1.1 KiB
Plaintext
$NetBSD: patch-aa,v 1.6 2014/06/29 03:24:33 dholland Exp $
|
|
|
|
- use standard headers
|
|
- don't redeclare memmove
|
|
|
|
--- ar.h.orig 1993-05-01 04:04:22.000000000 +0000
|
|
+++ ar.h
|
|
@@ -7,6 +7,7 @@ Adapted from "ar" archiver written by Ha
|
|
***********************************************************/
|
|
|
|
#include <stdio.h>
|
|
+#include <string.h>
|
|
|
|
#ifdef ANSI_HDRS
|
|
# include <limits.h>
|
|
@@ -15,11 +16,15 @@ Adapted from "ar" archiver written by Ha
|
|
/* uchar should be 8 bits or more */
|
|
/* typedef unsigned char uchar; -- already in zoo.h */
|
|
|
|
+#if !(defined(__FreeBSD__) && __FreeBSD__ < 3) && !defined(__OpenBSD__) && !defined(__NetBSD__)
|
|
typedef unsigned int uint; /* 16 bits or more */
|
|
#if !defined(__386BSD__) || !defined(_TYPES_H_)
|
|
typedef unsigned short ushort; /* 16 bits or more */
|
|
#endif
|
|
typedef unsigned long ulong; /* 32 bits or more */
|
|
+#else
|
|
+# include <sys/types.h>
|
|
+#endif
|
|
|
|
/* T_UINT16 must be #defined in options.h to be
|
|
a 16-bit unsigned integer type */
|
|
@@ -116,7 +121,6 @@ int make_tree
|
|
void move_left();
|
|
#else
|
|
# define MOVE_LEFT memmove
|
|
- extern VOIDPTR memmove();
|
|
#endif
|
|
|
|
#if 0
|