diff options
| author | Elliott Hughes <enh@google.com> | 2012-09-12 11:08:45 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-12 11:08:45 -0700 |
| commit | 6cfba16c25d04ae13c5b06d53bb495571bd83e95 (patch) | |
| tree | 11a828463109a1834be267238514511cb7eb736e /services/common_time | |
| parent | c4091423d81e039043a754b2588b4fd29a8774cf (diff) | |
| parent | 40ad466e4e9669b43b72c4736ec9e8e27ddb5cfc (diff) | |
| download | frameworks_base-6cfba16c25d04ae13c5b06d53bb495571bd83e95.zip frameworks_base-6cfba16c25d04ae13c5b06d53bb495571bd83e95.tar.gz frameworks_base-6cfba16c25d04ae13c5b06d53bb495571bd83e95.tar.bz2 | |
am 40ad466e: am 4c686dad: am cceed1df: Merge "Include <sys/socket.h> instead of <linux/socket.h>."
* commit '40ad466e4e9669b43b72c4736ec9e8e27ddb5cfc':
Include <sys/socket.h> instead of <linux/socket.h>.
Diffstat (limited to 'services/common_time')
| -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 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 f6a2419..6e18050 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> |