diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/binder/IPCThreadState.h | 2 | ||||
-rw-r--r-- | include/gui/BufferQueueCore.h | 10 | ||||
-rw-r--r-- | include/gui/ISurfaceComposer.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/include/binder/IPCThreadState.h b/include/binder/IPCThreadState.h index 6e0c01b..b29c266 100644 --- a/include/binder/IPCThreadState.h +++ b/include/binder/IPCThreadState.h @@ -22,7 +22,7 @@ #include <binder/ProcessState.h> #include <utils/Vector.h> -#ifdef HAVE_WIN32_PROC +#if defined(_WIN32) typedef int uid_t; #endif diff --git a/include/gui/BufferQueueCore.h b/include/gui/BufferQueueCore.h index 1050e3b..1d975c0 100644 --- a/include/gui/BufferQueueCore.h +++ b/include/gui/BufferQueueCore.h @@ -29,11 +29,11 @@ #include <utils/Trace.h> #include <utils/Vector.h> -#define BQ_LOGV(x, ...) ALOGV("[%s] "x, mConsumerName.string(), ##__VA_ARGS__) -#define BQ_LOGD(x, ...) ALOGD("[%s] "x, mConsumerName.string(), ##__VA_ARGS__) -#define BQ_LOGI(x, ...) ALOGI("[%s] "x, mConsumerName.string(), ##__VA_ARGS__) -#define BQ_LOGW(x, ...) ALOGW("[%s] "x, mConsumerName.string(), ##__VA_ARGS__) -#define BQ_LOGE(x, ...) ALOGE("[%s] "x, mConsumerName.string(), ##__VA_ARGS__) +#define BQ_LOGV(x, ...) ALOGV("[%s] " x, mConsumerName.string(), ##__VA_ARGS__) +#define BQ_LOGD(x, ...) ALOGD("[%s] " x, mConsumerName.string(), ##__VA_ARGS__) +#define BQ_LOGI(x, ...) ALOGI("[%s] " x, mConsumerName.string(), ##__VA_ARGS__) +#define BQ_LOGW(x, ...) ALOGW("[%s] " x, mConsumerName.string(), ##__VA_ARGS__) +#define BQ_LOGE(x, ...) ALOGE("[%s] " x, mConsumerName.string(), ##__VA_ARGS__) #define ATRACE_BUFFER_INDEX(index) \ if (ATRACE_ENABLED()) { \ diff --git a/include/gui/ISurfaceComposer.h b/include/gui/ISurfaceComposer.h index 51717a4..f04a848 100644 --- a/include/gui/ISurfaceComposer.h +++ b/include/gui/ISurfaceComposer.h @@ -39,7 +39,7 @@ namespace android { class ComposerState; class DisplayState; struct DisplayInfo; -class DisplayStatInfo; +struct DisplayStatInfo; class IDisplayEventConnection; class IMemoryHeap; class Rect; |