diff options
| author | Elliott Hughes <enh@google.com> | 2012-09-12 08:50:35 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-09-12 08:50:35 -0700 |
| commit | fbe1cc92d9e8930700c15f68717dd66fc1523177 (patch) | |
| tree | 0945efcd310fd65e90fc39f2ea796b619d74a7f4 | |
| parent | 290ac69379e649a2fed1d9441a17e39c6a912d8c (diff) | |
| parent | e5167f88f3734a048dc44199f3fff0432589db43 (diff) | |
| download | frameworks_av-fbe1cc92d9e8930700c15f68717dd66fc1523177.zip frameworks_av-fbe1cc92d9e8930700c15f68717dd66fc1523177.tar.gz frameworks_av-fbe1cc92d9e8930700c15f68717dd66fc1523177.tar.bz2 | |
Merge "Don't include <linux/socket.h> directly."
| -rw-r--r-- | media/common_time/ICommonClock.cpp | 3 | ||||
| -rw-r--r-- | media/common_time/ICommonTimeConfig.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/media/common_time/ICommonClock.cpp b/media/common_time/ICommonClock.cpp index 28b43ac..25ae69e 100644 --- a/media/common_time/ICommonClock.cpp +++ b/media/common_time/ICommonClock.cpp @@ -13,7 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include <linux/socket.h> + +#include <sys/socket.h> #include <common_time/ICommonClock.h> #include <binder/Parcel.h> diff --git a/media/common_time/ICommonTimeConfig.cpp b/media/common_time/ICommonTimeConfig.cpp index 8eb37cb..67167b0 100644 --- a/media/common_time/ICommonTimeConfig.cpp +++ b/media/common_time/ICommonTimeConfig.cpp @@ -13,7 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include <linux/socket.h> + +#include <sys/socket.h> #include <common_time/ICommonTimeConfig.h> #include <binder/Parcel.h> |