diff options
| author | mseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-20 02:06:01 +0000 |
|---|---|---|
| committer | mseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-20 02:06:01 +0000 |
| commit | d5b2197037aac358c1ac7c747e2761e1562a584b (patch) | |
| tree | 8e9f448966eb4215d77a65da0865503530498761 /ppapi | |
| parent | af2f56c8ee88d09483ef83792f9b9a31f4f08f79 (diff) | |
| download | chromium_src-d5b2197037aac358c1ac7c747e2761e1562a584b.zip chromium_src-d5b2197037aac358c1ac7c747e2761e1562a584b.tar.gz chromium_src-d5b2197037aac358c1ac7c747e2761e1562a584b.tar.bz2 | |
Revert 147594 - NaCl: Remove two uses of '#include "nacl/nacl_log.h"'
"git cl dcommit" went crazy and appears to have reverted the 3
previous commits at the same time as committing my change. (This
might be due to race conditions with running "git fetch"
concurrently.)
TBR=mseaborn@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10815024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147601 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
| -rw-r--r-- | ppapi/native_client/tests/ppapi_browser/ppb_audio/ppapi_ppb_audio.cc | 3 | ||||
| -rw-r--r-- | ppapi/native_client/tests/ppapi_example_audio/audio.cc | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_audio/ppapi_ppb_audio.cc b/ppapi/native_client/tests/ppapi_browser/ppb_audio/ppapi_ppb_audio.cc index 14dd93e..1dfc314 100644 --- a/ppapi/native_client/tests/ppapi_browser/ppb_audio/ppapi_ppb_audio.cc +++ b/ppapi/native_client/tests/ppapi_browser/ppb_audio/ppapi_ppb_audio.cc @@ -3,6 +3,8 @@ // found in the LICENSE file. // +#include <nacl/nacl_log.h> + #include <stdint.h> #include <stdio.h> #include <stdlib.h> @@ -14,6 +16,7 @@ #include "native_client/src/include/nacl_macros.h" #include "native_client/src/include/nacl/nacl_inttypes.h" +#include "native_client/src/shared/platform/nacl_check.h" #include "native_client/src/shared/ppapi_proxy/utility.h" #include "native_client/tests/ppapi_test_lib/get_browser_interface.h" #include "native_client/tests/ppapi_test_lib/test_interface.h" diff --git a/ppapi/native_client/tests/ppapi_example_audio/audio.cc b/ppapi/native_client/tests/ppapi_example_audio/audio.cc index 4574b30..e2c6a32 100644 --- a/ppapi/native_client/tests/ppapi_example_audio/audio.cc +++ b/ppapi/native_client/tests/ppapi_example_audio/audio.cc @@ -3,6 +3,8 @@ // found in the LICENSE file. // +#include <nacl/nacl_log.h> + #include <stdint.h> #include <stdio.h> #include <stdlib.h> @@ -12,7 +14,6 @@ #include <limits> #include <string> #include "native_client/src/include/nacl/nacl_inttypes.h" -#include "native_client/src/shared/platform/nacl_log.h" #include "native_client/src/shared/ppapi_proxy/utility.h" #include "ppapi/c/pp_bool.h" #include "ppapi/c/pp_errors.h" |