Merge b742690ad1 into 6468ae8314

rebar.config

@@ -13,7 +13,10 @@
 
     %% OS X Snow Leopard flags for 32-bit
     {"darwin10.*-32$", "CXXFLAGS", "-m32"},
-    {"darwin10.*-32$", "LDFLAGS", "-arch i386"}
+    {"darwin10.*-32$", "LDFLAGS", "-arch i386"},
+    
+    %% this will merge into basho/rebar/rebar.config eventually
+    {"win32", "CFLAGS", "/Wall /DWIN32 /D_WINDOWS /D_WIN32 /DWINDOWS"}
 ]}.
 
 

src/jiffy.erl

@@ -93,7 +93,8 @@ init() ->
         Path ->
             Path
     end,
-    erlang:load_nif(filename:join(PrivDir, "jiffy"), 0).
+    catch(erlang:load_nif(filename:join(PrivDir, "jiffy"), 0)),
+    ok.
 
 
 not_loaded(Line) ->