Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 4c686dad: am cceed1df: Merge "Include <sys/socket.h> instead of <linux/socket.h>."

Browse Source 
* commit '4c686dad83b6712e0e1abab6aba9c7bb683000b2':
  Include <sys/socket.h> instead of <linux/socket.h>.
This commit is contained in:
Elliott Hughes
2012-09-12 11:06:56 -07:00
committed by Android Git Automerger
parent 53d1864c10 4c686dad83
commit 40ad466e4e
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/common_time/common_clock_service.h
View File

@@ -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;

5
services/common_time/common_time_config_service.h
View File

@@ -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;

2
services/common_time/common_time_server.h
View File

@@ -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>