Changeset 5493:ed802d14a722 in roaraudio

Timestamp:

05/05/12 12:40:38 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

test for needed functions, not just fail on OpenBSD

Files:

• configure (modified) (1 diff)
• plugins/roard/listenpty.c (modified) (2 diffs)

configure

@@ -1858 +1858 @@
 test_func_defmake ROAR_HAVE_SRAND     srand     'srand((unsigned int)0)'     -- stdlib.h
 test_func_defmake ROAR_HAVE_FCNTL     fcntl     'fcntl(0, 0)'                -- unistd.h fcntl.h
+test_func_defmake ROAR_HAVE_POSIX_OPENPT posix_openpt 'posix_openpt(0)'      -- stdlib.h fcntl.h
+test_func_defmake ROAR_HAVE_GRANTPT   grantpt   'grantpt(0)'                 -- stdlib.h
+test_func_defmake ROAR_HAVE_UNLOCKPT  unlockpt  'unlockpt(0)'                -- stdlib.h
+test_func_defmake ROAR_HAVE_TCGETATTR tcgetattr 'tcgetattr(0, (struct termios *)0)' -- termios.h unistd.h
+test_func_defmake ROAR_HAVE_TCSETATTR tcsetattr 'tcsetattr(0, TCSANOW, (struct termios *)0)' -- termios.h unistd.h
+test_func_defmake ROAR_HAVE_CFMAKERAW cfmakeraw 'cfmakeraw((struct termios *)0)' -- termios.h unistd.h
 test_func_defmake ROAR_HAVE_REBOOT    reboot    'reboot(LINUX_REBOOT_CMD_RESTART|LINUX_REBOOT_CMD_HALT|LINUX_REBOOT_CMD_POWER_OFF|LINUX_REBOOT_CMD_CAD_ON|LINUX_REBOOT_CMD_CAD_OFF)' -- unistd.h linux/reboot.h sys/reboot.h
 test_func_defmake ROAR_HAVE_LINUX_SENDFILE sendfile 'sendfile(-1, -1, (void*)0, 0)' -- sys/sendfile.h

plugins/roard/listenpty.c

@@ -25 +25 @@
 
 #include <roard/include/roard.h>
+
+#if defined(ROAR_HAVE_POSIX_OPENPT) && defined(ROAR_HAVE_GRANTPT) && defined(ROAR_HAVE_UNLOCKPT) && defined(ROAR_HAVE_TCGETATTR) && defined(ROAR_HAVE_TCSETATTR) && defined(ROAR_HAVE_CFMAKERAW)
+#define __HAVE_SUPPORT
+#endif
+
+#ifdef __HAVE_SUPPORT
 #include <termios.h>
+#endif
 
 static int init  (struct roar_dl_librarypara * para) {
+#ifdef __HAVE_SUPPORT
  int serverfh = posix_openpt(O_RDWR|O_NOCTTY);
  struct termios termios;
@@ -52 +60 @@
  ROAR_WARN("PTY Slave: %s", ptsname(serverfh));
  return 0;
+#else
+ ROAR_ERR("No PTY Support found so can not load listenpty plugin.");
+ return -1;
+#endif
 }