Changeset 5480:045af2045a6d in roaraudio

Timestamp:

04/23/12 13:03:59 (11 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

corrected win32 fix for stdvios

File:

• libroar/vio_stdvios.c (modified) (1 diff)

libroar/vio_stdvios.c

@@ -69 +69 @@
 };
 
+#ifndef ROAR_TARGET_WIN32
 struct roar_vio_calls * roar_stdin  = &(_libroar_vio_stdvios[0]);
 struct roar_vio_calls * roar_stdout = &(_libroar_vio_stdvios[1]);
 struct roar_vio_calls * roar_stderr = &(_libroar_vio_stdvios[2]);
+#else
+struct roar_vio_calls ** libroar_stdvio_win32workaround(int fh) {
+ static struct roar_vio_calls * vios[3] = {
+  &(_libroar_vio_stdvios[0]),
+  &(_libroar_vio_stdvios[1]),
+  &(_libroar_vio_stdvios[2])
+ };
 
-#ifdef ROAR_TARGET_WIN32
-struct roar_vio_calls ** libroar_stdvio_win32workaround(int fh) {
- switch (fh) {
-  case 0: return &roar_stdin;  break;
-  case 1: return &roar_stdout; break;
-  case 2: return &roar_stderr; break;
-  default:
-    roar_strap(ROAR_TRAP_GROUP_LIBROAR, "libroar_stdvio_win32workaround.bad-fh");
-    roar_err_set(ROAR_ERROR_BADFH); // just in case somebody uses a debugger.
-    return NULL;
-   break;
+ if ( fh >= 0 && fh <= 2) {
+  return &(vios[fh]);
+ } else {
+  roar_strap(ROAR_TRAP_GROUP_LIBROAR, "libroar_stdvio_win32workaround.bad-fh");
+  roar_err_set(ROAR_ERROR_BADFH); // just in case somebody uses a debugger.
+  return NULL;
  }
 }