Reverse sense of new_inets test, for better interaction with rebar

tonyg · Nov 15, 2011 · f471b41 · f471b41
1 parent 834e5ff
commit f471b41
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -15,9 +15,9 @@ PACKAGE_NAME=rfc4627_jsonrpc
 ## change, and supply a compile-time macro definition to allow
 ## rfc4627_jsonrpc_inets.erl to adapt to the new path.
 ifeq ($(shell test R14A \> $$(erl -noshell -eval 'io:format(erlang:system_info(otp_release)), halt().') && echo yes),yes)
-INETS_DEF=
+INETS_DEF=-Dold_inets
 else
-INETS_DEF=-Dnew_inets
+INETS_DEF=
 endif
 
 all: $(TARGETS)

diff --git a/src/rfc4627_jsonrpc_inets.erl b/src/rfc4627_jsonrpc_inets.erl
@@ -91,10 +91,10 @@
 %% The path to httpd.hrl has changed in OTP R14A and newer. Our
 %% Makefile detects the change for us, and supplies a compile-time
 %% macro definition to allow us to adapt to the new path.
--ifdef(new_inets).
--include_lib("inets/src/http_server/httpd.hrl").
--else.
+-ifdef(old_inets).
 -include_lib("inets/src/httpd.hrl").
+-else.
+-include_lib("inets/src/http_server/httpd.hrl").
 -endif.
 
 -export([do/1, load/2]).