diff options
Diffstat (limited to 'src/common/windows')
-rw-r--r-- | src/common/windows/dia_util.cc | 4 | ||||
-rw-r--r-- | src/common/windows/guid_string.cc | 4 | ||||
-rw-r--r-- | src/common/windows/http_upload.cc | 4 | ||||
-rw-r--r-- | src/common/windows/omap.cc | 4 | ||||
-rw-r--r-- | src/common/windows/omap_unittest.cc | 4 | ||||
-rw-r--r-- | src/common/windows/pdb_source_line_writer.cc | 4 | ||||
-rw-r--r-- | src/common/windows/pe_source_line_writer.cc | 4 | ||||
-rw-r--r-- | src/common/windows/pe_source_line_writer.h | 7 | ||||
-rw-r--r-- | src/common/windows/pe_util.cc | 4 | ||||
-rw-r--r-- | src/common/windows/string_utils.cc | 4 | ||||
-rw-r--r-- | src/common/windows/sym_upload_v2_protocol.cc | 4 | ||||
-rw-r--r-- | src/common/windows/symbol_collector_client.cc | 4 |
12 files changed, 47 insertions, 4 deletions
diff --git a/src/common/windows/dia_util.cc b/src/common/windows/dia_util.cc index dcfe0ef9..a5d984d1 100644 --- a/src/common/windows/dia_util.cc +++ b/src/common/windows/dia_util.cc @@ -26,6 +26,10 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#ifdef HAVE_CONFIG_H +#include <config.h> // Must come first +#endif + #include "common/windows/dia_util.h" #include <atlbase.h> diff --git a/src/common/windows/guid_string.cc b/src/common/windows/guid_string.cc index be9eb8a3..2c298c33 100644 --- a/src/common/windows/guid_string.cc +++ b/src/common/windows/guid_string.cc @@ -30,6 +30,10 @@ // // See guid_string.h for documentation. +#ifdef HAVE_CONFIG_H +#include <config.h> // Must come first +#endif + #include <wchar.h> #include "common/windows/string_utils-inl.h" diff --git a/src/common/windows/http_upload.cc b/src/common/windows/http_upload.cc index 088a5e54..bd48a233 100644 --- a/src/common/windows/http_upload.cc +++ b/src/common/windows/http_upload.cc @@ -26,6 +26,10 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#ifdef HAVE_CONFIG_H +#include <config.h> // Must come first +#endif + #include <assert.h> // Disable exception handler warnings. diff --git a/src/common/windows/omap.cc b/src/common/windows/omap.cc index ad916997..1ffcec76 100644 --- a/src/common/windows/omap.cc +++ b/src/common/windows/omap.cc @@ -100,6 +100,10 @@ // position) so that resolution will work as expected for translated addresses. // This is transparent to the rest of the toolchain. +#ifdef HAVE_CONFIG_H +#include <config.h> // Must come first +#endif + #include "common/windows/omap.h" #include <atlbase.h> diff --git a/src/common/windows/omap_unittest.cc b/src/common/windows/omap_unittest.cc index 841e5391..ebe0d47e 100644 --- a/src/common/windows/omap_unittest.cc +++ b/src/common/windows/omap_unittest.cc @@ -28,6 +28,10 @@ // Unittests for OMAP related functions. +#ifdef HAVE_CONFIG_H +#include <config.h> // Must come first +#endif + #include "common/windows/omap.h" #include "breakpad_googletest_includes.h" diff --git a/src/common/windows/pdb_source_line_writer.cc b/src/common/windows/pdb_source_line_writer.cc index 800c316f..dd80a6d2 100644 --- a/src/common/windows/pdb_source_line_writer.cc +++ b/src/common/windows/pdb_source_line_writer.cc @@ -26,6 +26,10 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#ifdef HAVE_CONFIG_H +#include <config.h> // Must come first +#endif + #include "common/windows/pdb_source_line_writer.h" #include <windows.h> diff --git a/src/common/windows/pe_source_line_writer.cc b/src/common/windows/pe_source_line_writer.cc index a568e0c7..d1d25cf4 100644 --- a/src/common/windows/pe_source_line_writer.cc +++ b/src/common/windows/pe_source_line_writer.cc @@ -26,6 +26,10 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#ifdef HAVE_CONFIG_H +#include <config.h> // Must come first +#endif + #include "common/windows/pe_source_line_writer.h" #include "common/windows/pe_util.h" diff --git a/src/common/windows/pe_source_line_writer.h b/src/common/windows/pe_source_line_writer.h index a3748145..324663ba 100644 --- a/src/common/windows/pe_source_line_writer.h +++ b/src/common/windows/pe_source_line_writer.h @@ -31,7 +31,6 @@ #include <string> -#include "common/basictypes.h" #include "common/windows/module_info.h" namespace google_breakpad { @@ -44,6 +43,8 @@ using std::wstring; class PESourceLineWriter { public: explicit PESourceLineWriter(const wstring& pe_file); + PESourceLineWriter(const PESourceLineWriter&) = delete; + void operator=(const PESourceLineWriter&) = delete; ~PESourceLineWriter(); // Writes Breakpad symbols from the pe file to |symbol_file|. @@ -58,9 +59,7 @@ public: bool GetPEInfo(PEModuleInfo* info); private: - const wstring pe_file_; - - DISALLOW_COPY_AND_ASSIGN(PESourceLineWriter); + const wstring pe_file_; }; } // namespace google_breakpad diff --git a/src/common/windows/pe_util.cc b/src/common/windows/pe_util.cc index 1df93105..2d4aebe7 100644 --- a/src/common/windows/pe_util.cc +++ b/src/common/windows/pe_util.cc @@ -26,6 +26,10 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#ifdef HAVE_CONFIG_H +#include <config.h> // Must come first +#endif + #include "pe_util.h" #include <windows.h> diff --git a/src/common/windows/string_utils.cc b/src/common/windows/string_utils.cc index 01dca193..1e570b52 100644 --- a/src/common/windows/string_utils.cc +++ b/src/common/windows/string_utils.cc @@ -26,6 +26,10 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#ifdef HAVE_CONFIG_H +#include <config.h> // Must come first +#endif + #include <cassert> #include <vector> diff --git a/src/common/windows/sym_upload_v2_protocol.cc b/src/common/windows/sym_upload_v2_protocol.cc index f2dc660c..450f3626 100644 --- a/src/common/windows/sym_upload_v2_protocol.cc +++ b/src/common/windows/sym_upload_v2_protocol.cc @@ -26,6 +26,10 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#ifdef HAVE_CONFIG_H +#include <config.h> // Must come first +#endif + #include "common/windows/sym_upload_v2_protocol.h" #include <cstdio> diff --git a/src/common/windows/symbol_collector_client.cc b/src/common/windows/symbol_collector_client.cc index 187b100e..d91b702b 100644 --- a/src/common/windows/symbol_collector_client.cc +++ b/src/common/windows/symbol_collector_client.cc @@ -1,3 +1,7 @@ +#ifdef HAVE_CONFIG_H +#include <config.h> // Must come first +#endif + #include "common/windows/symbol_collector_client.h" #include <stdio.h> |