am 42696d97: Merge "Make vdc a C++ file as a base for further improvement."

* commit '42696d97ce138fa5e7a1380b3841250549acb615':
  Make vdc a C++ file as a base for further improvement.
This commit is contained in:
Paul Crowley 2015-05-06 23:48:01 +00:00 committed by Android Git Automerger
commit 4f817d1bd2
2 changed files with 2 additions and 2 deletions

View file

@ -104,7 +104,7 @@ include $(CLEAR_VARS)
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_CLANG := true
LOCAL_SRC_FILES:= vdc.c
LOCAL_SRC_FILES:= vdc.cpp
LOCAL_MODULE:= vdc
LOCAL_SHARED_LIBRARIES := libcutils
LOCAL_CFLAGS := $(vold_cflags)

View file

@ -100,7 +100,7 @@ static int do_cmd(int sock, int argc, char **argv) {
}
static int do_monitor(int sock, int stop_after_cmd) {
char *buffer = malloc(4096);
char *buffer = (char *) malloc(4096);
if (!stop_after_cmd)
printf("[Connected to Vold]\n");