summaryrefslogtreecommitdiffstats
path: root/services/common_time
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2012-09-11 18:50:25 -0700
committerElliott Hughes <enh@google.com>2012-09-11 18:50:25 -0700
commit778c859bfdcce2fa6658c09e65656afc34d3b4e0 (patch)
tree65d906f659a125b6558f971f31865116d431a408 /services/common_time
parentba3cf72a08368ab40556b07b4518536bb59eb2f6 (diff)
downloadframeworks_base-778c859bfdcce2fa6658c09e65656afc34d3b4e0.zip
frameworks_base-778c859bfdcce2fa6658c09e65656afc34d3b4e0.tar.gz
frameworks_base-778c859bfdcce2fa6658c09e65656afc34d3b4e0.tar.bz2
Include <sys/socket.h> instead of <linux/socket.h>.
In newer kernels, <linux/socket.h> no longer contains some of the stuff you're using. Change-Id: I92c6847d73c20fb49d0db15c1cc15aa07fb5d44d
Diffstat (limited to 'services/common_time')
-rw-r--r--services/common_time/common_clock_service.h5
-rw-r--r--services/common_time/common_time_config_service.h5
-rw-r--r--services/common_time/common_time_server.h2
3 files changed, 7 insertions, 5 deletions
diff --git a/services/common_time/common_clock_service.h b/services/common_time/common_clock_service.h
index a65e398..bd663f0 100644
--- a/services/common_time/common_clock_service.h
+++ b/services/common_time/common_clock_service.h
@@ -14,11 +14,12 @@
* limitations under the License.
*/
-#include <common_time/ICommonClock.h>
-
#ifndef ANDROID_COMMON_CLOCK_SERVICE_H
#define ANDROID_COMMON_CLOCK_SERVICE_H
+#include <sys/socket.h>
+#include <common_time/ICommonClock.h>
+
namespace android {
class CommonTimeServer;
diff --git a/services/common_time/common_time_config_service.h b/services/common_time/common_time_config_service.h
index 8283c24..89806dd 100644
--- a/services/common_time/common_time_config_service.h
+++ b/services/common_time/common_time_config_service.h
@@ -13,11 +13,12 @@
* limitations under the License.
*/
-#include <common_time/ICommonTimeConfig.h>
-
#ifndef ANDROID_COMMON_TIME_CONFIG_SERVICE_H
#define ANDROID_COMMON_TIME_CONFIG_SERVICE_H
+#include <sys/socket.h>
+#include <common_time/ICommonTimeConfig.h>
+
namespace android {
class String16;
diff --git a/services/common_time/common_time_server.h b/services/common_time/common_time_server.h
index a0f549f..89bca64 100644
--- a/services/common_time/common_time_server.h
+++ b/services/common_time/common_time_server.h
@@ -19,7 +19,7 @@
#include <arpa/inet.h>
#include <stdint.h>
-#include <linux/socket.h>
+#include <sys/socket.h>
#include <common_time/ICommonClock.h>
#include <common_time/local_clock.h>