pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

portablexdr: Remove typedefs for reserved names



Module Name:	pkgsrc-wip
Committed By:	Sijmen J. Mulder <sjmulder%NetBSD.org@localhost>
Pushed By:	sjmulder
Date:		Sat Aug 7 22:27:32 2021 +0200
Changeset:	38d508af7de2e61fe16dcadfa084ce4972d9c0e5

Modified Files:
	portablexdr/distinfo
Added Files:
	portablexdr/patches/patch-rpc_types.h

Log Message:
portablexdr: Remove typedefs for reserved names

Name conflict with musl-libc, and they don't seem to be required by
portablexdr or libvirt.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=38d508af7de2e61fe16dcadfa084ce4972d9c0e5

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 portablexdr/distinfo                  |  1 +
 portablexdr/patches/patch-rpc_types.h | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)

diffs:
diff --git a/portablexdr/distinfo b/portablexdr/distinfo
index e53c3a1e55..35b9ef2a01 100644
--- a/portablexdr/distinfo
+++ b/portablexdr/distinfo
@@ -5,3 +5,4 @@ RMD160 (portablexdr-4.9.1.tar.gz) = 59a977098f5c6b6d090021b4aa64bd89db22d70b
 SHA512 (portablexdr-4.9.1.tar.gz) = 47f2402e7ed9f2f518e2a45e76e8ad6c4b1e7ae1bd9408ca4dca3d0883697e755460ee64eef405e23b1840ad3b89ad54555bdf59dc8bae3cd8b67086d6ab3b1f
 Size (portablexdr-4.9.1.tar.gz) = 354321 bytes
 SHA1 (patch-rpc_rpc.h) = 728723b57ae3702ee154136d5af95c06cb277cd6
+SHA1 (patch-rpc_types.h) = 3b0a84a850e16cf57bf59650112e098156340160
diff --git a/portablexdr/patches/patch-rpc_types.h b/portablexdr/patches/patch-rpc_types.h
new file mode 100644
index 0000000000..4469988c76
--- /dev/null
+++ b/portablexdr/patches/patch-rpc_types.h
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Remove types defined with reserved names, breaks build with musl-libc
+where those names are already defined in sys/types.h.
+
+--- rpc/types.h.orig	2009-01-12 15:55:23.000000000 +0000
++++ rpc/types.h
+@@ -41,9 +41,6 @@ typedef unsigned char u_char;
+ typedef uint16_t      u_short;
+ typedef uint32_t      u_int;
+ typedef unsigned long u_long;
+-typedef uint64_t      u_quad_t;
+-typedef int64_t       quad_t;
+-typedef char *        caddr_t;
+ 
+ #ifndef TRUE
+ #define TRUE 1


Home | Main Index | Thread Index | Old Index