Merge remote-tracking branch 'origin/topic/johanna/bit-1976'

* origin/topic/johanna/bit-1976:
  Allow event/function definitions to be wrapped in directives.

Fixed to work with attributes (e.g. &priority).

src/main.cc

@@ -848,7 +848,7 @@ int main(int argc, char** argv)
 			add_input_file(argv[optind++]);
 		}
 
-	push_scope(0);
+	push_scope(nullptr, nullptr);
 
 	dns_mgr = new DNS_Mgr(dns_type);