Now that the 1_8 branch is about to EOL, we really don't need the #if(n)defs on cvs trunk any more. (I'm not sure of our spacing rules, or I'd do this myself.)
http://mxr.mozilla.org/seamonkey/source/camino/src/browser/BrowserWrapper.mm I think we want all the Gecko-related #include-s together, with no spacing within the Gecko-related group, so remove lines 64-67 and 69-70 http://mxr.mozilla.org/seamonkey/source/camino/src/browser/BrowserWindowController.mm Remove 2101-2104 (I don't think we care about the comment anymore since it's branch-only) and 2106.
Created attachment 350706 [details] [diff] [review] 1_8 branch ifdefectomy Does the deed, per cl's suggestions. We can still block and unblock popups.
Comment on attachment 350706 [details] [diff] [review] 1_8 branch ifdefectomy Looks good here.
Comment on attachment 350706 [details] [diff] [review] 1_8 branch ifdefectomy sr=smorgan
Landed on cvs trunk.