diff options
author | Rickard Green <[email protected]> | 2019-02-25 11:20:52 +0100 |
---|---|---|
committer | Rickard Green <[email protected]> | 2019-02-25 11:20:52 +0100 |
commit | 5045fe8660545754ab5ec6bb3cbcf3a8ff7d9697 (patch) | |
tree | 6073545f9b4a579e3299b0d36f9aeacfc4d0d64b /lib/erl_interface/src | |
parent | 2c06e174d6515b6a842906de9e6ebc70bd2f2ec0 (diff) | |
parent | 00fa7a8def826d2a4c8fb9e2c38208103bf04341 (diff) | |
download | otp-5045fe8660545754ab5ec6bb3cbcf3a8ff7d9697.tar.gz otp-5045fe8660545754ab5ec6bb3cbcf3a8ff7d9697.tar.bz2 otp-5045fe8660545754ab5ec6bb3cbcf3a8ff7d9697.zip |
Merge branch 'rickard/deprecations-removals'
OTP-15621 OTP-15622
* rickard/deprecations-removals:
Document deprecations and removals
Diffstat (limited to 'lib/erl_interface/src')
-rw-r--r-- | lib/erl_interface/src/Makefile.in | 7 | ||||
-rw-r--r-- | lib/erl_interface/src/misc/eidef.h | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in index b05d494884..1b19a85f1e 100644 --- a/lib/erl_interface/src/Makefile.in +++ b/lib/erl_interface/src/Makefile.in @@ -118,7 +118,7 @@ else AR_FLAGS=rcv endif -INCFLAGS = -I. -I../include -Iconnect -Iencode -Idecode -Imisc -Iepmd \ +INCFLAGS = -I. -I../include -I../include/$(TARGET) -Iconnect -Iencode -Idecode -Imisc -Iepmd \ -Iregistry -I$(TARGET) ifeq ($(USING_VC),yes) @@ -127,6 +127,8 @@ else WARNFLAGS = @WFLAGS@ endif +WARNFLAGS += -DEI_NO_DEPR_WARN + CFLAGS = @LIB_CFLAGS@ $(WARNFLAGS) $(INCFLAGS) $(TYPE_FLAGS) PROG_CFLAGS = @CFLAGS@ $(WARNFLAGS) $(INCFLAGS) $(TYPE_FLAGS) -Ilegacy @@ -320,7 +322,8 @@ HEADERS = \ ../include/ei.h \ ../include/ei_connect.h \ ../include/eicode.h \ - ../include/erl_interface.h + ../include/erl_interface.h \ + ../include/$(TARGET)/ei_config.h EISOURCES = \ $(CONNECTSRC) \ diff --git a/lib/erl_interface/src/misc/eidef.h b/lib/erl_interface/src/misc/eidef.h index f38824d826..083814c6e9 100644 --- a/lib/erl_interface/src/misc/eidef.h +++ b/lib/erl_interface/src/misc/eidef.h @@ -25,6 +25,7 @@ /* Common definitions used in ei user interface */ +#define EI_INCLUDED_CONFIG_H__ #include "config.h" /* Central include of config.h */ /* vxWorks.h needs to be before stddef.h */ |