Merge remote-tracking branch 'upstream_eosio/master' into eosio_build_darwin_mongo

libraries/abi_generator/include/eosio/abi_generator/abi_generator.hpp

@@ -9,7 +9,8 @@
 #include <eosio/chain/contracts/types.hpp>
 #include <fc/io/json.hpp>
 
-//clashes with something deep in the AST includes
+//clashes with something deep in the AST includes in clang 6 and possibly other versions of clang
+#pragma push_macro("N")
 #undef N
 
 #include "clang/Driver/Options.h"
@@ -228,3 +229,5 @@ namespace eosio {
    };
 
 } //ns eosio
+
+#pragma pop_macro("N")
\ No newline at end of file