From ad5579948594188783fe38ba6636839ba6f4443c Mon Sep 17 00:00:00 2001 From: f3nix Date: Fri, 22 Feb 2008 20:38:49 +0000 Subject: [PATCH] Fix compilation errors/warnings when using g++ 4.3 (snapshot). --- pcbnew/gen_holes_and_tools_lists_for_drill.cpp | 1 + pcbnew/gendrill.cpp | 2 ++ 2 files changed, 3 insertions(+) diff --git a/pcbnew/gen_holes_and_tools_lists_for_drill.cpp b/pcbnew/gen_holes_and_tools_lists_for_drill.cpp index e6b6d56404..ba4fe79bb6 100644 --- a/pcbnew/gen_holes_and_tools_lists_for_drill.cpp +++ b/pcbnew/gen_holes_and_tools_lists_for_drill.cpp @@ -6,6 +6,7 @@ using namespace std; +#include // sort #include #include "common.h" diff --git a/pcbnew/gendrill.cpp b/pcbnew/gendrill.cpp index 3f10de8460..f8ee393839 100644 --- a/pcbnew/gendrill.cpp +++ b/pcbnew/gendrill.cpp @@ -130,11 +130,13 @@ void WinEDA_DrillFrame::InitDisplayParams( void ) for( D_PAD* pad = module->m_Pads; pad != NULL; pad = pad->Next() ) { if( pad->m_DrillShape == PAD_CIRCLE ) + { if( pad->m_Drill.x != 0 ) m_PadsHoleCount++; else if( MIN( pad->m_Drill.x, pad->m_Drill.y ) != 0 ) m_PadsHoleCount++; + } } }