am 554c0f35: am 05647c89: Merge change 25170 into eclair

Merge commit '554c0f351b2d02abbbc443a7bb209f800be6f399'

* commit '554c0f351b2d02abbbc443a7bb209f800be6f399':
  Disable sched_policy under Windows.

include/arch/darwin-x86/AndroidConfig.h

@@ -265,4 +265,9 @@
  */
 #define HAVE_STDBOOL_H 1
 
+/*
+ * Define if <sched.h> exists.
+ */
+#define HAVE_SCHED_H 1
+
 #endif /*_ANDROID_CONFIG_H*/

include/arch/freebsd-x86/AndroidConfig.h

@@ -324,4 +324,9 @@
  */
 /* #define HAVE_STDBOOL_H */
 
+/*
+ * Define if <sched.h> exists.
+ */
+#define HAVE_SCHED_H 1
+
 #endif /*_ANDROID_CONFIG_H*/

include/arch/linux-arm/AndroidConfig.h

@@ -312,4 +312,9 @@
  */
 #define HAVE_STDBOOL_H 1
 
+/*
+ * Define if <sched.h> exists.
+ */
+#define HAVE_SCHED_H 1
+
 #endif /* _ANDROID_CONFIG_H */

include/arch/linux-x86/AndroidConfig.h

@@ -293,4 +293,9 @@
  */
 #define HAVE_STDBOOL_H 1
 
+/*
+ * Define if <sched.h> exists.
+ */
+#define HAVE_SCHED_H 1
+
 #endif /*_ANDROID_CONFIG_H*/

include/arch/target_linux-x86/AndroidConfig.h

@@ -303,4 +303,9 @@
  */
 #define HAVE_STDBOOL_H 1
 
+/*
+ * Define if <sched.h> exists.
+ */
+#define HAVE_SCHED_H 1
+
 #endif /* _ANDROID_CONFIG_H */

include/arch/windows/AndroidConfig.h

@@ -297,4 +297,9 @@
  */
 /* #define HAVE_STDBOOL_H */
 
+/*
+ * Define if <sched.h> exists.
+ */
+/* #define HAVE_SCHED_H */
+
 #endif /*_ANDROID_CONFIG_H*/

libcutils/sched_policy.c

@@ -1,3 +1,4 @@
+
 /* libs/cutils/sched_policy.c
 **
 ** Copyright 2007, The Android Open Source Project
@@ -21,6 +22,9 @@
 #include <string.h>
 #include <errno.h>
 #include <fcntl.h>
+
+#ifdef HAVE_SCHED_H
+
 #include <sched.h>
 
 #include <cutils/sched_policy.h>
@@ -89,3 +93,5 @@ int set_sched_policy(int tid, SchedPolicy policy)
 
     return 0;
 }
+
+#endif /* HAVE_SCHED_H */