[NaCl SDK] Compile for naclio for Bionic

native_client_sdk/src/libraries/nacl_io/syscalls/ioctl.c

Index: native_client_sdk/src/libraries/nacl_io/syscalls/ioctl.c
diff --git a/native_client_sdk/src/libraries/nacl_io/syscalls/ioctl.c b/native_client_sdk/src/libraries/nacl_io/syscalls/ioctl.c
index 3b7958a66fb85af61cbb664239a0ff04e938ef85..10a1f5b3bee4267375637eb8007e7dd5de3099ca 100644
--- a/native_client_sdk/src/libraries/nacl_io/syscalls/ioctl.c
+++ b/native_client_sdk/src/libraries/nacl_io/syscalls/ioctl.c
@@ -1,13 +1,25 @@
-/* Copyright (c) 2013 The Chromium Authors. All rights reserved.
+/* Copyright 2013 The Chromium Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file. */
 
+#include <sys/types.h>
+/*
+ * Include something that will define __BIONIC__, then wrap the entire file
+ * in this #if, so this file will be compiled on a non-bionic build.
+ */

[Sam Clegg, 2014/03/27 00:10:02]

Comment is not true.  Maybe just drop it.. Also doesn't the stdarg include below
include __BIONIC__?  Maybe you can drop the sys/types.h include too?

[noelallen1, 2014/03/27 18:13:48]

Done.

+
 #include <stdarg.h>
 
 #include "nacl_io/kernel_intercept.h"
 #include "nacl_io/kernel_wrap.h"
 
-int ioctl(int fd, unsigned long request, ...) {
+#ifdef __BIONIC__
+#define REQ_TYPE int
+#else
+#define REQ_TYPE unsigned long
+#endif
+
+int ioctl(int fd, REQ_TYPE request, ...) {
   va_list ap;
   va_start(ap, request);
   int rtn = ki_ioctl(fd, request, ap);