unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
blob f7e11059b1eddd3c8b159b1954a6f1338027b2a2 2107 bytes (raw)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
 
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


debug log:

solving f7e11059b1 ...
found f7e11059b1 in https://git.savannah.gnu.org/cgit/guix.git

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).