File seabios.be050664fdd1699fe7bcf3a9b6faff07172a83d... of Package qemu-2.5

Overview Repositories Revisions Requests Users Attributes Meta

File seabios.be050664fdd1699fe7bcf3a9b6faff07172a83d6.patch of Package qemu-2.5 (Revision 77a6d35881e361daaf68557825243243)

Currently displaying revision 77a6d35881e361daaf68557825243243 , Show latest

From: Kevin O'Connor <kevin@koconnor.net>
Date: Mon, 1 Jun 2015 18:32:06 -0400
Subject: be050664fdd1699fe7bcf3a9b6faff07172a83d6

Don't forward declare functions with "inline" in headers

Don't mark function definitions in headers with "inline" - it causes
compile warnings on gcc v5.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Acked-by: Paul Menzel <paulepanter@sourceforge.net>
---
 src/hw/usb-hid.h | 8 ++++----
 src/string.h     | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

--- a/src/hw/usb-hid.h
+++ b/src/hw/usb-hid.h
@@ -1,22 +1,22 @@
 #ifndef __USB_HID_H
 #define __USB_HID_H
 
 // usb-hid.c
 struct usbdevice_s;
 int usb_hid_setup(struct usbdevice_s *usbdev);
-inline int usb_kbd_active(void);
-inline int usb_kbd_command(int command, u8 *param);
-inline int usb_mouse_active(void);
-inline int usb_mouse_command(int command, u8 *param);
+int usb_kbd_active(void);
+int usb_kbd_command(int command, u8 *param);
+int usb_mouse_active(void);
+int usb_mouse_command(int command, u8 *param);
 void usb_check_event(void);
 
 
 /****************************************************************
  * hid flags
  ****************************************************************/
 
 #define USB_INTERFACE_SUBCLASS_BOOT     1
 #define USB_INTERFACE_PROTOCOL_KEYBOARD 1
 #define USB_INTERFACE_PROTOCOL_MOUSE    2
 
 #define HID_REQ_GET_REPORT              0x01
--- a/src/string.h
+++ b/src/string.h
@@ -2,30 +2,30 @@
 #ifndef __STRING_H
 #define __STRING_H
 
 #include "types.h" // u32
 
 // string.c
 u8 checksum_far(u16 buf_seg, void *buf_far, u32 len);
 u8 checksum(void *buf, u32 len);
 size_t strlen(const char *s);
 int memcmp_far(u16 s1seg, const void *s1, u16 s2seg, const void *s2, size_t n);
 int memcmp(const void *s1, const void *s2, size_t n);
 int strcmp(const char *s1, const char *s2);
-inline void memset_far(u16 d_seg, void *d_far, u8 c, size_t len);
-inline void memset16_far(u16 d_seg, void *d_far, u16 c, size_t len);
+void memset_far(u16 d_seg, void *d_far, u8 c, size_t len);
+void memset16_far(u16 d_seg, void *d_far, u16 c, size_t len);
 void *memset(void *s, int c, size_t n);
 void memset_fl(void *ptr, u8 val, size_t size);
-inline void memcpy_far(u16 d_seg, void *d_far
-                       , u16 s_seg, const void *s_far, size_t len);
+void memcpy_far(u16 d_seg, void *d_far
+                , u16 s_seg, const void *s_far, size_t len);
 void memcpy_fl(void *d_fl, const void *s_fl, size_t len);
 void *memcpy(void *d1, const void *s1, size_t len);
 #if MODESEGMENT == 0
 #define memcpy __builtin_memcpy
 #endif
 void iomemcpy(void *d, const void *s, u32 len);
 void *memmove(void *d, const void *s, size_t len);
 char *strtcpy(char *dest, const char *src, size_t len);
 char *strchr(const char *s, int c);
 char *nullTrailingSpace(char *buf);
 
 #endif // string.h

Places

File seabios.be050664fdd1699fe7bcf3a9b6faff07172a83d6.patch of Package qemu-2.5 (Revision 77a6d35881e361daaf68557825243243)

Places