mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2025-01-31 06:46:50 +01:00
36f9348675
* gnu/packages/patches/libpciaccess-hurd64.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/xorg.scm (libpciaccess) [arguments]: Use g-expressions. When building for the 64bit Hurd, use it in new "apply-hurd64-patch" phase. Change-Id: I8936377da726681b748cc010e1fbae3fb19dee05
58 lines
2.1 KiB
Diff
58 lines
2.1 KiB
Diff
Upstream-status: Taken from upstream:
|
|
|
|
<https://gitlab.freedesktop.org/xorg/lib/libpciaccess/-/commit/6cd5a4afbb70868c7746de8d50dea59e02e9acf2>.
|
|
|
|
From 6cd5a4afbb70868c7746de8d50dea59e02e9acf2 Mon Sep 17 00:00:00 2001
|
|
From: Flavio Cruz <flaviocruz@gmail.com>
|
|
Date: Wed, 28 Jun 2023 01:02:34 -0400
|
|
Subject: [PATCH] Fix compilation warnings when building against hurd-amd64.
|
|
Content-Transfer-Encoding: 8bit
|
|
Content-Type: text/plain; charset=UTF-8
|
|
|
|
Passes mach_msg_type_number_t instead of size_t which have different
|
|
sizes. Example warning:
|
|
|
|
/hurd_pci.c:101:53: warning: passing argument 3 of 'pci_get_dev_regions' from incompatible pointer type [-Wincompatible-pointer-types]
|
|
101 | err = pci_get_dev_regions(d->device_port, &buf, &size);
|
|
| ^~~~~
|
|
| |
|
|
| size_t * {aka long unsigned int *}
|
|
---
|
|
src/hurd_pci.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/src/hurd_pci.c b/src/hurd_pci.c
|
|
index 8653e1b..9ac3813 100644
|
|
--- a/src/hurd_pci.c
|
|
+++ b/src/hurd_pci.c
|
|
@@ -82,7 +82,7 @@ pci_device_hurd_probe(struct pci_device *dev)
|
|
struct pci_bar regions[6];
|
|
struct pci_xrom_bar rom;
|
|
struct pci_device_private *d;
|
|
- size_t size;
|
|
+ mach_msg_type_number_t size;
|
|
char *buf;
|
|
|
|
/* Many of the fields were filled in during initial device enumeration.
|
|
@@ -323,7 +323,7 @@ pciclient_cfg_read(mach_port_t device_port, int reg, char *buf,
|
|
size_t * nbytes)
|
|
{
|
|
int err;
|
|
- size_t nread;
|
|
+ mach_msg_type_number_t nread;
|
|
char *data;
|
|
|
|
data = buf;
|
|
@@ -473,7 +473,7 @@ simple_readdir(mach_port_t port, uint32_t *first_entry)
|
|
{
|
|
char *data;
|
|
int nentries = 0;
|
|
- vm_size_t size;
|
|
+ mach_msg_type_number_t size;
|
|
|
|
dir_readdir (port, &data, &size, *first_entry, 1, 0, &nentries);
|
|
|
|
--
|
|
Janneke Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond https://LilyPond.org
|
|
Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com
|
|
|