KiCad

Merge lp:~xzcvczx/kicad/fctsys into lp:kicad/product

  1. fctsys
  2. Merge into product
Proposed by xzcvczx
Status: Merged
Merged at revision: 6374
Proposed branch: lp:~xzcvczx/kicad/fctsys
Merge into: lp:kicad/product
Diff against target: 18 lines (+0/-8)
1 file modified
include/fctsys.h (+0/-8)
To merge this branch: bzr merge lp:~xzcvczx/kicad/fctsys
Reviewer Review Type Date Requested Status
Wayne Stambaugh Needs Information
Review via email: mp+280384@code.launchpad.net

Description of the change

Removed specific include of Carbon as its unnecessary, Tested by myself and confirmed with Adam Wolf who also had no issues

To post a comment you must log in.
Revision history for this message
Wayne Stambaugh (stambaughw) wrote :

Looks fine to me. Adam, can I please get confirmation on this that you have tested it? Thanks.

review: Needs Information
Revision history for this message
Adam Wolf (adamwolf) wrote :

Confirmed.

Revision history for this message
Wayne Stambaugh (stambaughw) wrote :

Merge committed in product branch r6374. Thanks.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'include/fctsys.h'
2--- include/fctsys.h 2015-07-29 18:06:45 +0000
3+++ include/fctsys.h 2015-12-12 10:11:12 +0000
4@@ -27,14 +27,6 @@
5
6 #include <wx/wx.h>
7
8-/**
9- * @note This appears to already be included in the OSX build of wxWidgets.
10- * Will someone with OSX please remove this and see if it compiles?
11- */
12-#ifdef __WXMAC__
13-#include <Carbon/Carbon.h>
14-#endif
15-
16 #ifdef DEBUG
17 #define DBG(x) x
18 #else