Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40ad466e authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

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

* commit '4c686dad':
  Include <sys/socket.h> instead of <linux/socket.h>.
parents 53d1864c 4c686dad

services/common_time/common_clock_service.h

+3 −2
Original line number Diff line number Diff line
@@ -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;

services/common_time/common_time_config_service.h

+3 −2
Original line number Diff line number Diff line
@@ -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;

services/common_time/common_time_server.h

+1 −1
Original line number Diff line number Diff line
@@ -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>