diff options
| author | Hans Nilsson <[email protected]> | 2019-06-27 14:19:00 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2019-06-27 14:19:00 +0200 |
| commit | d545b771d09f4af494ed829f735639e638a3992e (patch) | |
| tree | aea8b87d7beffa3e9057bd57a382841d47abc212 /lib | |
| parent | a60e5433f7115d7ef245638767c723f1c336a9e6 (diff) | |
| parent | 2630808e2eedb99dc29d6c9755947f0cb087288a (diff) | |
| download | otp-d545b771d09f4af494ed829f735639e638a3992e.tar.gz otp-d545b771d09f4af494ed829f735639e638a3992e.tar.bz2 otp-d545b771d09f4af494ed829f735639e638a3992e.zip | |
Merge branch 'maint'
* maint:
crypto: Fix the build of static crypto nifs
Remove unused "ssh_assert" macro definition
Remove unused "ssh_key" record definition
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/crypto/c_src/Makefile.in | 3 | ||||
| -rw-r--r-- | lib/ssh/src/ssh.hrl | 15 |
2 files changed, 1 insertions, 17 deletions
diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in index 2512013ed6..f922c3fb9b 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in @@ -100,8 +100,7 @@ CRYPTO_OBJS = $(OBJDIR)/crypto$(TYPEMARKER).o \ $(OBJDIR)/srp$(TYPEMARKER).o CALLBACK_OBJS = $(OBJDIR)/crypto_callback$(TYPEMARKER).o NIF_MAKEFILE = $(PRIVDIR)/Makefile -CRYPTO_STATIC_OBJS = $(OBJDIR)/crypto_static$(TYPEMARKER).o\ - $(OBJDIR)/crypto_callback_static$(TYPEMARKER).o +CRYPTO_STATIC_OBJS = $(patsubst $(OBJDIR)/%$(TYPEMARKER).o,$(OBJDIR)/%_static$(TYPEMARKER).o,$(CRYPTO_OBJS) $(CALLBACK_OBJS)) NIF_ARCHIVE = $(LIBDIR)/crypto$(TYPEMARKER).a diff --git a/lib/ssh/src/ssh.hrl b/lib/ssh/src/ssh.hrl index 0014002192..a991f72cf2 100644 --- a/lib/ssh/src/ssh.hrl +++ b/lib/ssh/src/ssh.hrl @@ -479,14 +479,6 @@ recv_ext_info }). --record(ssh_key, - { - type, - public, - private, - comment = "" - }). - -record(ssh_pty, {term = "", % e.g. "xterm" width = 80, height = 25, @@ -494,13 +486,6 @@ pixel_height = 768, modes = <<>>}). -%% assertion macro --define(ssh_assert(Expr, Reason), - case Expr of - true -> ok; - _ -> exit(Reason) - end). - %% dbg help macros -define(wr_record(N,BlackList), |