frodovdr/vdr-plugin-softhddevice
1
0
Fork 0
mirror of https://projects.vdr-developer.org/git/vdr-plugin-softhddevice.git synced 2023-10-10 19:16:51 +02:00
Code Issues Releases Wiki Activity

FreeBSD compatibility fix.

Browse Source
This commit is contained in:
Johns 2012-07-09 17:17:16 +02:00
parent 2cdce610d6
commit 15583a79c4
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
codec.c
View File

@ -39,7 +39,11 @@
#include <stdio.h> #include <stdio.h>
#include <unistd.h> #include <unistd.h>
#ifdef __FreeBSD__
#include <sys/endian.h>
#else
#include <endian.h> #include <endian.h>
#endif
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>

19
softhddev.c
View File

@ -22,6 +22,9 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#ifdef __FreeBSD__
#include <signal.h>
#endif
#include <fcntl.h> #include <fcntl.h>
#include <stdio.h> #include <stdio.h>
@ -2309,6 +2312,13 @@ int ProcessArgs(int argc, char *const argv[])
// //
// Parse arguments. // Parse arguments.
// //
#ifdef __FreeBSD__
if (!strcmp(*argv, "softhddevice")) {
++argv;
--argc;
}
#endif
for (;;) { for (;;) {
switch (getopt(argc, argv, "-a:c:d:fg:p:sv:w:xD")) { switch (getopt(argc, argv, "-a:c:d:fg:p:sv:w:xD")) {
case 'a': // audio device for pcm case 'a': // audio device for pcm
@ -2396,7 +2406,11 @@ int ProcessArgs(int argc, char *const argv[])
#define XSERVER_MAX_ARGS 512 ///< how many arguments support #define XSERVER_MAX_ARGS 512 ///< how many arguments support
#ifndef __FreeBSD__
static const char *X11Server = "/usr/bin/X"; ///< default x11 server static const char *X11Server = "/usr/bin/X"; ///< default x11 server
#else
static const char *X11Server = LOCALBASE "/bin/X"; ///< default x11 server
#endif
static const char *X11ServerArguments; ///< default command arguments static const char *X11ServerArguments; ///< default command arguments
static pid_t X11ServerPid; ///< x11 server pid static pid_t X11ServerPid; ///< x11 server pid
@ -2442,7 +2456,12 @@ static void StartXServer(void)
if ((sval = X11ServerArguments)) { if ((sval = X11ServerArguments)) {
char *s; char *s;
#ifndef __FreeBSD__
s = buf = strdupa(sval); s = buf = strdupa(sval);
#else
s = buf = alloca(strlen(sval) + 1);
strcpy(buf, sval);
#endif
while ((sval = strsep(&s, " \t"))) { while ((sval = strsep(&s, " \t"))) {
args[argn++] = sval; args[argn++] = sval;