diff options
| author | Elliott Hughes <enh@google.com> | 2014-07-19 01:24:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-07-17 22:34:48 +0000 |
| commit | 949aad363a9cc794f9ac8fd42338ae1678e50bc1 (patch) | |
| tree | 1eeec565c9cf0ba9d39d56decd73586f58ad39d4 | |
| parent | 3bbaa29066a684d01df42ddf0365266e59f2dc44 (diff) | |
| parent | ea563325a91b2e9bf1e3623a2f6d91414dc292c2 (diff) | |
| download | omap3-949aad363a9cc794f9ac8fd42338ae1678e50bc1.tar.gz | |
Merge "Always #include <sys/...>, not <linux/...>."
4 files changed, 4 insertions, 4 deletions
diff --git a/omx/audio/src/openmax_il/aac_dec/src/OMX_AacDec_CompThread.c b/omx/audio/src/openmax_il/aac_dec/src/OMX_AacDec_CompThread.c index 4c65d9b..4a94f93 100644 --- a/omx/audio/src/openmax_il/aac_dec/src/OMX_AacDec_CompThread.c +++ b/omx/audio/src/openmax_il/aac_dec/src/OMX_AacDec_CompThread.c @@ -78,7 +78,7 @@ #ifdef ANDROID #include <utils/threads.h> -#include <linux/prctl.h> +#include <sys/prctl.h> #endif #include "OMX_AacDec_Utils.h" diff --git a/omx/audio/src/openmax_il/mp3_dec/src/OMX_Mp3Dec_CompThread.c b/omx/audio/src/openmax_il/mp3_dec/src/OMX_Mp3Dec_CompThread.c index a9c21e3..c5938a0 100644 --- a/omx/audio/src/openmax_il/mp3_dec/src/OMX_Mp3Dec_CompThread.c +++ b/omx/audio/src/openmax_il/mp3_dec/src/OMX_Mp3Dec_CompThread.c @@ -77,7 +77,7 @@ #ifdef ANDROID #include <utils/threads.h> -#include <linux/prctl.h> +#include <sys/prctl.h> #endif #include "OMX_Mp3Dec_Utils.h" diff --git a/omx/audio/src/openmax_il/wbamr_dec/src/OMX_WbAmrDec_ComponentThread.c b/omx/audio/src/openmax_il/wbamr_dec/src/OMX_WbAmrDec_ComponentThread.c index 3541b1a..1e73d4e 100644 --- a/omx/audio/src/openmax_il/wbamr_dec/src/OMX_WbAmrDec_ComponentThread.c +++ b/omx/audio/src/openmax_il/wbamr_dec/src/OMX_WbAmrDec_ComponentThread.c @@ -67,7 +67,7 @@ #ifdef ANDROID #include <sys/resource.h> #include <utils/threads.h> -#include <linux/prctl.h> +#include <sys/prctl.h> #endif #include "OMX_WbAmrDec_Utils.h" #include "OMX_WbAmrDecoder.h" diff --git a/omx/system/src/openmax_il/lcml/src/LCML_DspCodec.c b/omx/system/src/openmax_il/lcml/src/LCML_DspCodec.c index 09c2969..ec01e73 100644 --- a/omx/system/src/openmax_il/lcml/src/LCML_DspCodec.c +++ b/omx/system/src/openmax_il/lcml/src/LCML_DspCodec.c @@ -49,7 +49,7 @@ #endif #ifdef ANDROID -#include <linux/prctl.h> +#include <sys/prctl.h> #endif #include <pthread.h> |