| Index: runtime/bin/gen_snapshot.cc
|
| diff --git a/runtime/bin/gen_snapshot.cc b/runtime/bin/gen_snapshot.cc
|
| index 20cc410dc753d22662647a0d4dcc96451e79382a..1f955e5a5bd382c4f94c454b1259aca015bf6e79 100644
|
| --- a/runtime/bin/gen_snapshot.cc
|
| +++ b/runtime/bin/gen_snapshot.cc
|
| @@ -5,14 +5,12 @@
|
| // Generate a snapshot file after loading all the scripts specified on the
|
| // command line.
|
|
|
| +#include <stdio.h>
|
| #include <stdlib.h>
|
| #include <string.h>
|
| -#include <stdio.h>
|
|
|
| #include <cstdarg>
|
|
|
| -#include "include/dart_api.h"
|
| -
|
| #include "bin/builtin.h"
|
| #include "bin/dartutils.h"
|
| #include "bin/eventhandler.h"
|
| @@ -22,8 +20,9 @@
|
| #include "bin/utils.h"
|
| #include "bin/vmservice_impl.h"
|
|
|
| -#include "platform/globals.h"
|
| +#include "include/dart_api.h"
|
|
|
| +#include "platform/globals.h"
|
|
|
| namespace dart {
|
| namespace bin {
|
| @@ -181,16 +180,16 @@ static int ParseArguments(int argc,
|
| return -1;
|
| }
|
|
|
| - if (instructions_snapshot_filename != NULL &&
|
| - embedder_entry_points_manifest == NULL) {
|
| + if ((instructions_snapshot_filename != NULL) &&
|
| + (embedder_entry_points_manifest == NULL)) {
|
| Log::PrintErr(
|
| "Specifying an instructions snapshot filename indicates precompilation"
|
| ". But no embedder entry points manifest was specified.\n\n");
|
| return -1;
|
| }
|
|
|
| - if (embedder_entry_points_manifest != NULL &&
|
| - instructions_snapshot_filename == NULL) {
|
| + if ((embedder_entry_points_manifest != NULL) &&
|
| + (instructions_snapshot_filename == NULL)) {
|
| Log::PrintErr(
|
| "Specifying the embedder entry points manifest indicates "
|
| "precompilation. But no instuctions snapshot was specified.\n\n");
|
| @@ -828,7 +827,7 @@ static Dart_QualifiedFunctionName* ParseEntryPointsManifestFile(
|
| static Dart_QualifiedFunctionName* ParseEntryPointsManifestIfPresent() {
|
| Dart_QualifiedFunctionName* entries =
|
| ParseEntryPointsManifestFile(embedder_entry_points_manifest);
|
| - if (entries == NULL && IsSnapshottingForPrecompilation()) {
|
| + if ((entries == NULL) && IsSnapshottingForPrecompilation()) {
|
| Log::PrintErr(
|
| "Could not find native embedder entry points during precompilation\n");
|
| exit(255);
|
|
|