From db1cda26539c711c3da7ed4d410dfe8190e89b8f Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 3 Aug 2019 12:12:40 -0400 Subject: convert_UTF: rewrite in C++ This allows us to namespace the symbols properly. Bug: google-breakpad:725 Change-Id: Iea8052547eef6c0acb299c1995781735c6d8994f Reviewed-on: https://chromium-review.googlesource.com/c/breakpad/breakpad/+/1769236 Reviewed-by: Mark Mentovai --- src/client/solaris/handler/Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/client/solaris') diff --git a/src/client/solaris/handler/Makefile b/src/client/solaris/handler/Makefile index beeb9448..6da9464e 100644 --- a/src/client/solaris/handler/Makefile +++ b/src/client/solaris/handler/Makefile @@ -40,13 +40,13 @@ BIN_DIR=. THREAD_SRC=solaris_lwp.cc SHARE_SRC=../../minidump_file_writer.cc\ + ../../../common/convert_UTF.cc\ ../../../common/md5.cc\ ../../../common/string_conversion.cc\ ../../../common/solaris/file_id.cc\ minidump_generator.cc HANDLER_SRC=exception_handler.cc\ ../../../common/solaris/guid_creator.cc -SHARE_C_SRC=../../../common/convert_UTF.c MINIDUMP_TEST_SRC=minidump_test.cc EXCEPTION_TEST_SRC=exception_handler_test.cc @@ -54,11 +54,10 @@ EXCEPTION_TEST_SRC=exception_handler_test.cc THREAD_OBJ=$(patsubst %.cc,$(OBJ_DIR)/%.o,$(THREAD_SRC)) SHARE_OBJ=$(patsubst %.cc,$(OBJ_DIR)/%.o,$(SHARE_SRC)) HANDLER_OBJ=$(patsubst %.cc,$(OBJ_DIR)/%.o,$(HANDLER_SRC)) -SHARE_C_OBJ=$(patsubst %.c,$(OBJ_DIR)/%.o,$(SHARE_C_SRC)) MINIDUMP_TEST_OBJ=$(patsubst %.cc,$(OBJ_DIR)/%.o, $(MINIDUMP_TEST_SRC))\ - $(THREAD_OBJ) $(SHARE_OBJ) $(SHARE_C_OBJ) $(HANDLER_OBJ) + $(THREAD_OBJ) $(SHARE_OBJ) $(HANDLER_OBJ) EXCEPTION_TEST_OBJ=$(patsubst %.cc,$(OBJ_DIR)/%.o, $(EXCEPTION_TEST_SRC))\ - $(THREAD_OBJ) $(SHARE_OBJ) $(SHARE_C_OBJ) $(HANDLER_OBJ) + $(THREAD_OBJ) $(SHARE_OBJ) $(HANDLER_OBJ) BIN=$(BIN_DIR)/minidump_test\ $(BIN_DIR)/exception_handler_test -- cgit v1.2.1