summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'libutils')
-rw-r--r--libutils/Android.bp7
-rw-r--r--libutils/Threads.cpp4
-rw-r--r--libutils/include/utils/String16.h2
-rw-r--r--libutils/include/utils/String8.h1
-rw-r--r--libutils/misc.cpp6
5 files changed, 11 insertions, 9 deletions
diff --git a/libutils/Android.bp b/libutils/Android.bp
index 4bd2a9859..6b50f0cff 100644
--- a/libutils/Android.bp
+++ b/libutils/Android.bp
@@ -136,9 +136,12 @@ cc_library {
136 cflags: ["-Wno-unused-parameter"], 136 cflags: ["-Wno-unused-parameter"],
137 }, 137 },
138 138
139 // Under MinGW, ctype.h doesn't need multi-byte support
140 windows: { 139 windows: {
141 cflags: ["-DMB_CUR_MAX=1"], 140 cflags: [
141 // Under MinGW, ctype.h doesn't need multi-byte support
142 "-DMB_CUR_MAX=1",
143 "-Wno-unused-private-field",
144 ],
142 145
143 enabled: true, 146 enabled: true,
144 }, 147 },
diff --git a/libutils/Threads.cpp b/libutils/Threads.cpp
index 6317c32d4..7d7f0e283 100644
--- a/libutils/Threads.cpp
+++ b/libutils/Threads.cpp
@@ -348,7 +348,7 @@ Mutex::Mutex()
348 mState = (void*) hMutex; 348 mState = (void*) hMutex;
349} 349}
350 350
351Mutex::Mutex(const char* name) 351Mutex::Mutex(const char* /*name*/)
352{ 352{
353 // XXX: name not used for now 353 // XXX: name not used for now
354 HANDLE hMutex; 354 HANDLE hMutex;
@@ -359,7 +359,7 @@ Mutex::Mutex(const char* name)
359 mState = (void*) hMutex; 359 mState = (void*) hMutex;
360} 360}
361 361
362Mutex::Mutex(int type, const char* name) 362Mutex::Mutex(int /*type*/, const char* /*name*/)
363{ 363{
364 // XXX: type and name not used for now 364 // XXX: type and name not used for now
365 HANDLE hMutex; 365 HANDLE hMutex;
diff --git a/libutils/include/utils/String16.h b/libutils/include/utils/String16.h
index cb3d338f2..15ed19fb8 100644
--- a/libutils/include/utils/String16.h
+++ b/libutils/include/utils/String16.h
@@ -35,9 +35,7 @@ namespace android {
35 35
36// --------------------------------------------------------------------------- 36// ---------------------------------------------------------------------------
37 37
38class SharedBuffer;
39class String8; 38class String8;
40class TextOutput;
41 39
42//! This is a string holding UTF-16 characters. 40//! This is a string holding UTF-16 characters.
43class String16 41class String16
diff --git a/libutils/include/utils/String8.h b/libutils/include/utils/String8.h
index 1f3e5d865..0225c6be6 100644
--- a/libutils/include/utils/String8.h
+++ b/libutils/include/utils/String8.h
@@ -31,7 +31,6 @@
31namespace android { 31namespace android {
32 32
33class String16; 33class String16;
34class TextOutput;
35 34
36//! This is a string holding UTF-8 characters. Does not allow the value more 35//! This is a string holding UTF-8 characters. Does not allow the value more
37// than 0x10FFFF, which is not valid unicode codepoint. 36// than 0x10FFFF, which is not valid unicode codepoint.
diff --git a/libutils/misc.cpp b/libutils/misc.cpp
index d95fd056b..da28dfae6 100644
--- a/libutils/misc.cpp
+++ b/libutils/misc.cpp
@@ -44,8 +44,8 @@ static pthread_mutex_t gSyspropMutex = PTHREAD_MUTEX_INITIALIZER;
44static Vector<sysprop_change_callback_info>* gSyspropList = NULL; 44static Vector<sysprop_change_callback_info>* gSyspropList = NULL;
45#endif 45#endif
46 46
47void add_sysprop_change_callback(sysprop_change_callback cb, int priority) {
48#if !defined(_WIN32) 47#if !defined(_WIN32)
48void add_sysprop_change_callback(sysprop_change_callback cb, int priority) {
49 pthread_mutex_lock(&gSyspropMutex); 49 pthread_mutex_lock(&gSyspropMutex);
50 if (gSyspropList == NULL) { 50 if (gSyspropList == NULL) {
51 gSyspropList = new Vector<sysprop_change_callback_info>(); 51 gSyspropList = new Vector<sysprop_change_callback_info>();
@@ -65,8 +65,10 @@ void add_sysprop_change_callback(sysprop_change_callback cb, int priority) {
65 gSyspropList->add(info); 65 gSyspropList->add(info);
66 } 66 }
67 pthread_mutex_unlock(&gSyspropMutex); 67 pthread_mutex_unlock(&gSyspropMutex);
68#endif
69} 68}
69#else
70void add_sysprop_change_callback(sysprop_change_callback, int) {}
71#endif
70 72
71#if defined(__ANDROID__) 73#if defined(__ANDROID__)
72void (*get_report_sysprop_change_func())() { 74void (*get_report_sysprop_change_func())() {