Use <stdint.h> types instead of non-standard types

The __uint32_t type is not a standard type, and not necessarily
provided by all C libraries. However, <stdint.h> provides a set of
standard types, which are guaranteed to be available with all C
libraries.

This patch therefore changes __uint32_t to uint32_t, which allows to
fix the compilation with the Musl C library.

This patch is already used by the Alpine Linux distribution and the
Buildroot build system.

Original patch from
http://git.alpinelinux.org/cgit/aports/plain/main/libraw1394/fix-types.patch.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
This commit is contained in:
Thomas Petazzoni 2016-02-12 10:18:07 +01:00 committed by Stefan Richter
parent a8b9a1b71f
commit 637359805c
3 changed files with 6 additions and 5 deletions

View File

@ -303,7 +303,7 @@ int fw_iso_recv_start(fw_handle_t handle, int start_on_cycle,
}
static int handle_iso_event(raw1394handle_t handle,
struct epoll_closure *closure, __uint32_t events)
struct epoll_closure *closure, uint32_t events)
{
fw_handle_t fwhandle = handle->mode.fw;
struct fw_cdev_event_iso_interrupt *interrupt;

View File

@ -187,7 +187,7 @@ scan_devices(fw_handle_t handle)
static int
handle_echo_pipe(raw1394handle_t handle,
struct epoll_closure *ec, __uint32_t events)
struct epoll_closure *ec, uint32_t events)
{
quadlet_t value;
@ -258,7 +258,7 @@ handle_fcp_request(raw1394handle_t handle, struct address_closure *ac,
static int
handle_device_event(raw1394handle_t handle,
struct epoll_closure *ec, __uint32_t events)
struct epoll_closure *ec, uint32_t events)
{
fw_handle_t fwhandle = handle->mode.fw;
union fw_cdev_event *u;
@ -421,7 +421,7 @@ process_inotify_event(fw_handle_t fwhandle, struct inotify_event *event)
static int
handle_inotify(raw1394handle_t handle, struct epoll_closure *ec,
__uint32_t events)
uint32_t events)
{
fw_handle_t fwhandle = handle->mode.fw;
struct inotify_event *event;

View File

@ -12,6 +12,7 @@
#ifndef LIBRAW1394_FW_H
#define LIBRAW1394_FW_H
#include <stdint.h>
#include <stdlib.h>
#include <byteswap.h>
@ -48,7 +49,7 @@ struct fw_handle;
struct epoll_closure {
int (*func)(raw1394handle_t handle,
struct epoll_closure *closure, __uint32_t events);
struct epoll_closure *closure, uint32_t events);
};
struct port {