small fixes

Makefile

@@ -1,12 +1,12 @@
 # Let's discover something about where we run
 ifeq "$(SHELL)" "cmd.exe"
-SYSTEM=win
+  SYSTEM=win
 else
-ifeq "$(SHELL)" "sh.exe"
-SYSTEM=win
-else
-SYSTEM=unix
-endif
+  ifeq "$(SHELL)" "sh.exe"
+    SYSTEM=win
+  else
+    SYSTEM=unix
+  endif
 endif
 
 # First, we include predefined variables

Makefile.build.cpp

@@ -435,4 +435,3 @@ objs/integer_solver_example.$O: examples/integer_solver_example.cc
 
 integer_solver_example$E: $(LP_LIBS) $(BASE_LIBS) objs/integer_solver_example.$O
 	$(CCC) $(CFLAGS) $(LDFLAGS) objs/integer_solver_example.$O $(LP_LIBS) $(BASE_LIBS) $(LDLPDEPS) $(EXEOUT)integer_solver_example$E
-

Makefile.build.python

@@ -87,4 +87,3 @@ _pywraplp.$(SHAREDLIBEXT): objs/linear_solver_wrap.$O $(LP_LIBS) $(BASE_LIBS)
 ifeq "$(SYSTEM)" "win"
 	copy _pywraplp.dll gen\\linear_solver\\_pywraplp.pyd
 endif
-

Makefile.def

@@ -21,12 +21,12 @@ UNIX_GLPK_DIR=../glpk-4.45
 # Linux jdk root
 # first, determine 32 or 64 bits.
 ifeq "$(SYSTEM)" "unix"
-LBITS := $(shell getconf LONG_BIT)
-ifeq ($(LBITS),64)
-   JDK_EXT=64
-else
-   JDK_EXT=32
-endif
+  LBITS := $(shell getconf LONG_BIT)
+  ifeq ($(LBITS),64)
+     JDK_EXT=64
+  else
+    JDK_EXT=32
+  endif
 endif
 
 LINUX_JDK_ROOT=/usr/local/buildtools/java/jdk-$(JDK_EXT)

Makefile.unix

@@ -120,4 +120,4 @@ OBJOUT=-o$(SPACE)
 EXEOUT=-o$(SPACE)
 DEL=rm -f
 S=/
-CPSEP=:
+CPSEP=:

Makefile.win

@@ -71,4 +71,3 @@ S=\\
 CPSEP=;
 DEL=del
 JNILIBEXT=dll
-

graph/bellman_ford.cc

@@ -47,7 +47,7 @@ class BellmanFord {
   const int node_count_;
   const int start_node_;
   scoped_ptr<ResultCallback2<int64, int, int> > graph_;
-  const int disconnected_distance_;
+  const int64 disconnected_distance_;
   scoped_array<int64> distance_;
   scoped_array<int> predecessor_;
 };

graph/shortestpaths.cc

@@ -17,6 +17,8 @@
 #include "base/callback.h"
 #include "base/commandlineflags.h"
 #include "base/integral_types.h"
+#include "base/logging.h"
+#include "base/macros.h"
 
 DEFINE_int32(shortestpaths_disconnected_distance, 200000,
              "Distance returned when two node are disconnected");