am 05647c89: Merge change 25170 into eclair
Merge commit '05647c89ef330c8d3fbc3504ecb5f29db89c84fd' into eclair-plus-aosp
* commit '05647c89ef330c8d3fbc3504ecb5f29db89c84fd':
Disable sched_policy under Windows.
diff --git a/include/arch/darwin-x86/AndroidConfig.h b/include/arch/darwin-x86/AndroidConfig.h
index c4de357..ad16e0c 100644
--- a/include/arch/darwin-x86/AndroidConfig.h
+++ b/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*/
diff --git a/include/arch/freebsd-x86/AndroidConfig.h b/include/arch/freebsd-x86/AndroidConfig.h
index 7ddbd27..39c564b 100644
--- a/include/arch/freebsd-x86/AndroidConfig.h
+++ b/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*/
diff --git a/include/arch/linux-arm/AndroidConfig.h b/include/arch/linux-arm/AndroidConfig.h
index 4371083..82e39c0 100644
--- a/include/arch/linux-arm/AndroidConfig.h
+++ b/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 */
diff --git a/include/arch/linux-x86/AndroidConfig.h b/include/arch/linux-x86/AndroidConfig.h
index 323e067..557ec5f 100644
--- a/include/arch/linux-x86/AndroidConfig.h
+++ b/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*/
diff --git a/include/arch/target_linux-x86/AndroidConfig.h b/include/arch/target_linux-x86/AndroidConfig.h
index 6ba7108..6605723 100644
--- a/include/arch/target_linux-x86/AndroidConfig.h
+++ b/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 */
diff --git a/include/arch/windows/AndroidConfig.h b/include/arch/windows/AndroidConfig.h
index 18e435c..b240519 100644
--- a/include/arch/windows/AndroidConfig.h
+++ b/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*/
diff --git a/libcutils/sched_policy.c b/libcutils/sched_policy.c
index 8c7d611..7553090 100644
--- a/libcutils/sched_policy.c
+++ b/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 @@
return 0;
}
+
+#endif /* HAVE_SCHED_H */