diff options
| author | Michele Calgaro <[email protected]> | 2025-01-28 17:09:39 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2025-01-30 23:05:53 +0900 |
| commit | 4767a3730d12a9e9f2d428d46da80467d73e5015 (patch) | |
| tree | faaed581dfd95241e12c31fcdcb7e31d670df6a4 /kscd | |
| parent | 83d0c59cf312df3614ba81844c68a5928afce924 (diff) | |
| download | tdemultimedia-4767a3730d12a9e9f2d428d46da80467d73e5015.tar.gz tdemultimedia-4767a3730d12a9e9f2d428d46da80467d73e5015.zip | |
Fix building with gcc 15. This resolves issue #91
Signed-off-by: Michele Calgaro <[email protected]>
Diffstat (limited to 'kscd')
| -rw-r--r-- | kscd/libwm/cddb.c | 2 | ||||
| -rw-r--r-- | kscd/libwm/include/wm_struct.h | 33 |
2 files changed, 18 insertions, 17 deletions
diff --git a/kscd/libwm/cddb.c b/kscd/libwm/cddb.c index e972ef0d..1d6e7026 100644 --- a/kscd/libwm/cddb.c +++ b/kscd/libwm/cddb.c @@ -41,6 +41,7 @@ #include <sys/time.h> #include <sys/socket.h> #include <netinet/in.h> +#include <arpa/inet.h> #include <netdb.h> #include "include/wm_config.h" @@ -234,7 +235,6 @@ connect_open(void) static struct in_addr defaddr; static char *alist[1]; static char namebuf[128]; - int inet_addr(); defaddr.s_addr = inet_addr(host); if ((int) defaddr.s_addr == -1) diff --git a/kscd/libwm/include/wm_struct.h b/kscd/libwm/include/wm_struct.h index 71afce07..4369c925 100644 --- a/kscd/libwm/include/wm_struct.h +++ b/kscd/libwm/include/wm_struct.h @@ -104,33 +104,34 @@ struct wm_cdinfo /* The global variable "cd" points to the struct for the CD that's playing. */ extern struct wm_cdinfo *cd; -extern struct wm_playlist *new_playlist(); +extern struct wm_playlist *new_playlist(struct wm_cdinfo*, char*); #define WM_STR_GENVENDOR "Generic" #define WM_STR_GENMODEL "drive" #define WM_STR_GENREV "type" +struct wm_drive; /* * Drive descriptor structure. Used for access to low-level routines. */ struct wm_drive_proto { - int (*gen_init)(); - int (*gen_close)(); - int (*gen_get_trackcount)(); - int (*gen_get_cdlen)(); - int (*gen_get_trackinfo)(); - int (*gen_get_drive_status)(); - int (*gen_get_volume)(); - int (*gen_set_volume)(); - int (*gen_pause)(); - int (*gen_resume)(); - int (*gen_stop)(); - int (*gen_play)(); - int (*gen_eject)(); - int (*gen_closetray)(); - int (*gen_get_cdtext)(); + int (*gen_init)(struct wm_drive*); + int (*gen_close)(struct wm_drive*); + int (*gen_get_trackcount)(struct wm_drive*, int*); + int (*gen_get_cdlen)(struct wm_drive*, int*); + int (*gen_get_trackinfo)(struct wm_drive*, int, int*, int*); + int (*gen_get_drive_status)(struct wm_drive*, int, int*, int*, int*, int*); + int (*gen_get_volume)( struct wm_drive*, int*, int*); + int (*gen_set_volume)( struct wm_drive*, int, int); + int (*gen_pause)(struct wm_drive*); + int (*gen_resume)(struct wm_drive*); + int (*gen_stop)(struct wm_drive*); + int (*gen_play)(struct wm_drive*, int, int, int); + int (*gen_eject)(struct wm_drive*); + int (*gen_closetray)(struct wm_drive*); + int (*gen_get_cdtext)(struct wm_drive*, unsigned char**, int*); }; struct wm_drive |