37 lines
1.6 KiB
Diff
37 lines
1.6 KiB
Diff
|
diff -U 3 -H -d -r -N -x .git -x .svn -- otp_src_R15B02/lib/crypto/c_src/Makefile.in otp_src_R15B02.rpath/lib/crypto/c_src/Makefile.in
|
||
|
|
--- otp_src_R15B02/lib/crypto/c_src/Makefile.in 2012-09-03 11:58:05.000000000 +0200
|
||
|
|
+++ otp_src_R15B02.rpath/lib/crypto/c_src/Makefile.in 2012-09-06 10:46:02.489523363 +0200
|
||
|
|
@@ -84,7 +84,7 @@
|
||
|
|
DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@
|
||
|
|
|
||
|
|
ifeq ($(DYNAMIC_CRYPTO_LIB),yes)
|
||
|
|
-SSL_DED_LD_RUNTIME_LIBRARY_PATH = @SSL_DED_LD_RUNTIME_LIBRARY_PATH@
|
||
|
|
+SSL_DED_LD_RUNTIME_LIBRARY_PATH =
|
||
|
|
CRYPTO_LINK_LIB=$(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) -l$(SSL_CRYPTO_LIBNAME)
|
||
|
|
else
|
||
|
|
SSL_DED_LD_RUNTIME_LIBRARY_PATH=
|
||
|
|
diff -U 3 -H -d -r -N -x .git -x .svn -- otp_src_R15B02/lib/crypto/priv/Makefile otp_src_R15B02.rpath/lib/crypto/priv/Makefile
|
||
|
|
--- otp_src_R15B02/lib/crypto/priv/Makefile 2012-09-03 11:58:05.000000000 +0200
|
||
|
|
+++ otp_src_R15B02.rpath/lib/crypto/priv/Makefile 2012-09-06 10:44:45.419641096 +0200
|
||
|
|
@@ -60,7 +60,7 @@
|
||
|
|
# ----------------------------------------------------
|
||
|
|
|
||
|
|
$(SO_NIFLIB): $(OBJS)
|
||
|
|
- $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) -Wl,-R$(SO_SSL_LIBDIR) \
|
||
|
|
+ $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) \
|
||
|
|
-o $@ $^ -lcrypto
|
||
|
|
|
||
|
|
$(DLL_NIFLIB): $(OBJS)
|
||
|
|
diff -U 3 -H -d -r -N -x .git -x .svn -- otp_src_R15B02/lib/odbc/c_src/odbcserver.c otp_src_R15B02.rpath/lib/odbc/c_src/odbcserver.c
|
||
|
|
--- otp_src_R15B02/lib/odbc/c_src/odbcserver.c 2012-09-03 11:58:05.000000000 +0200
|
||
|
|
+++ otp_src_R15B02.rpath/lib/odbc/c_src/odbcserver.c 2012-09-06 10:44:45.420641107 +0200
|
||
|
|
@@ -104,6 +104,8 @@
|
||
|
|
|
||
|
|
#ifdef UNIX
|
||
|
|
#include <unistd.h>
|
||
|
|
+#include <ctype.h>
|
||
|
|
+#include <arpa/inet.h>
|
||
|
|
#endif
|
||
|
|
|
||
|
|
#if defined WIN32
|