From 4202cce7073a4dce48092840e049a5459f084bfa Mon Sep 17 00:00:00 2001 From: marino Date: Tue, 30 Sep 2014 18:34:58 +0000 Subject: security/libbeid: Add header for malloc The existing patch removed "" but didn't provide "". Adjust to compound patch to fix that oversight. FWIW, the extra work to partially fix a patch is one reason I don't like one-patch-many-files. It's not the only reason. --- security/libbeid/files/patch-common | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'security') diff --git a/security/libbeid/files/patch-common b/security/libbeid/files/patch-common index 7ecaad66e218..e84a1bbfc2d9 100644 --- a/security/libbeid/files/patch-common +++ b/security/libbeid/files/patch-common @@ -36,14 +36,15 @@ Index: common/src/datafile.cpp } Index: common/src/logbase.cpp =================================================================== ---- common/src/logbase.cpp (revision 1614) -+++ common/src/logbase.cpp (working copy) -@@ -29,12 +29,7 @@ +--- common/src/logbase.cpp.orig 2014-09-30 18:10:35 UTC ++++ common/src/logbase.cpp +@@ -29,12 +29,8 @@ #include "mw_util.h" #ifndef WIN32 -#include -#ifdef LINUX ++#include #include "wintypes.h" -#else -#include "PCSC/wintypes.h" @@ -51,7 +52,7 @@ Index: common/src/logbase.cpp #include "sys/stat.h" #include "util.h" -@@ -575,6 +570,7 @@ bool CLog::open(bool bWchar) +@@ -575,6 +571,7 @@ bool CLog::open(bool bWchar) else err = fopen_s(&m_f,utilStringNarrow(filename).c_str(),"a"); #else -- cgit