diff options
| author | Elliott Hughes <enh@google.com> | 2012-09-12 11:04:45 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-12 11:04:45 -0700 |
| commit | 4c686dad83b6712e0e1abab6aba9c7bb683000b2 (patch) | |
| tree | f7b7085488b6d2cc510b1fbc8cd06a1a717fd263 | |
| parent | 70a5967e0bb295f64c99593043f138fdd62365f4 (diff) | |
| parent | cceed1dfe13e99c4ffdc2586bff22d325a57c599 (diff) | |
| download | base-4c686dad83b6712e0e1abab6aba9c7bb683000b2.tar.gz | |
am cceed1df: Merge "Include <sys/socket.h> instead of <linux/socket.h>."
* commit 'cceed1dfe13e99c4ffdc2586bff22d325a57c599':
Include <sys/socket.h> instead of <linux/socket.h>.
| -rw-r--r-- | services/common_time/common_clock_service.h | 5 | ||||
| -rw-r--r-- | services/common_time/common_time_config_service.h | 5 | ||||
| -rw-r--r-- | services/common_time/common_time_server.h | 2 |
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 a65e398d276f..bd663f06d43a 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 8283c24e0f4c..89806dd87e29 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 a0f549f6d8f9..89bca646769c 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> |