diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2015-06-01 18:32:06 -0400 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2015-06-03 19:21:37 -0400 |
| commit | be050664fdd1699fe7bcf3a9b6faff07172a83d6 (patch) | |
| tree | 80fd0ba40331043616cfcd8684e6ab70fca947b0 | |
| parent | 2aff1c10953bfb2f17b0702eb9e2962e1c78f3c9 (diff) | |
| download | seabios-be050664fdd1699fe7bcf3a9b6faff07172a83d6.zip seabios-be050664fdd1699fe7bcf3a9b6faff07172a83d6.tar.gz seabios-be050664fdd1699fe7bcf3a9b6faff07172a83d6.tar.bz2 | |
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>
| -rw-r--r-- | src/hw/usb-hid.h | 8 | ||||
| -rw-r--r-- | src/string.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/hw/usb-hid.h b/src/hw/usb-hid.h index ef34e79..fd7b8f8 100644 --- a/src/hw/usb-hid.h +++ b/src/hw/usb-hid.h @@ -4,10 +4,10 @@ // 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); diff --git a/src/string.h b/src/string.h index a557d6a..d069989 100644 --- a/src/string.h +++ b/src/string.h @@ -11,12 +11,12 @@ 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 |