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

Commit 20f66bed authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

Merge "There's only one <sys/system_properties.h> now." into main

parents f9f14436 30203af8

fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_server.cpp

+1 −3
Original line number Original line Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <stdio.h>

#include <stdio.h>

#include <stdlib.h>

#include <stdlib.h>

#include <sys/socket.h>

#include <sys/socket.h>

#include <sys/system_properties.h>

#include <sys/types.h>

#include <sys/types.h>

#include <unistd.h>

#include <unistd.h>
@@ -35,9 +36,6 @@ 
#include <snapuserd/snapuserd_client.h>

#include <snapuserd/snapuserd_client.h>

#include "snapuserd_server.h"

#include "snapuserd_server.h"





#define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_

#include <sys/_system_properties.h>



namespace android {

namespace android {

namespace snapshot {

namespace snapshot {

init/init.cpp

+1 −3
Original line number Original line Diff line number Diff line
@@ -26,13 +26,11 @@ 
#include <sys/eventfd.h>

#include <sys/eventfd.h>

#include <sys/mount.h>

#include <sys/mount.h>

#include <sys/signalfd.h>

#include <sys/signalfd.h>

#include <sys/system_properties.h>

#include <sys/types.h>

#include <sys/types.h>

#include <sys/utsname.h>

#include <sys/utsname.h>

#include <unistd.h>

#include <unistd.h>





#define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_

#include <sys/_system_properties.h>



#include <filesystem>

#include <filesystem>

#include <fstream>

#include <fstream>

#include <functional>

#include <functional>

init/property_service.cpp

+1 −3
Original line number Original line Diff line number Diff line
@@ -31,14 +31,12 @@ 
#include <sys/mman.h>

#include <sys/mman.h>

#include <sys/poll.h>

#include <sys/poll.h>

#include <sys/select.h>

#include <sys/select.h>

#include <sys/system_properties.h>

#include <sys/types.h>

#include <sys/types.h>

#include <sys/un.h>

#include <sys/un.h>

#include <unistd.h>

#include <unistd.h>

#include <wchar.h>

#include <wchar.h>





#define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_

#include <sys/_system_properties.h>



#include <map>

#include <map>

#include <memory>

#include <memory>

#include <mutex>

#include <mutex>

init/property_service_test.cpp

+1 −3
Original line number Original line Diff line number Diff line
@@ -16,11 +16,9 @@ 




#include <errno.h>

#include <errno.h>

#include <sys/socket.h>

#include <sys/socket.h>

#include <sys/system_properties.h>

#include <sys/un.h>

#include <sys/un.h>





#define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_

#include <sys/_system_properties.h>



#include <android-base/properties.h>

#include <android-base/properties.h>

#include <android-base/scopeguard.h>

#include <android-base/scopeguard.h>

#include <android-base/strings.h>

#include <android-base/strings.h>

libcutils/properties.cpp

+1 −2
Original line number Original line Diff line number Diff line
@@ -93,8 +93,7 @@ int property_get(const char* key, char* value, const char* default_value) { 




#if __has_include(<sys/system_properties.h>)

#if __has_include(<sys/system_properties.h>)





#define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_

#include <sys/system_properties.h>

#include <sys/_system_properties.h>





struct callback_data {

struct callback_data {

    void (*callback)(const char* name, const char* value, void* cookie);

    void (*callback)(const char* name, const char* value, void* cookie);