svn commit: r369654 - head/security/libbeid/files

[John Marino]

Author: marino
Date: Tue Sep 30 18:34:58 2014
New Revision: 369654
URL: http://svnweb.freebsd.org/changeset/ports/369654
QAT: https://qat.redports.org/buildarchive/r369654/

Log:
  security/libbeid: Add <stdlib.h> header for malloc
  
  The existing patch removed "<malloc.h>" but didn't provide "<stdlib.h>".
  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.

Modified:
  head/security/libbeid/files/patch-common

Modified: head/security/libbeid/files/patch-common
==============================================================================
--- head/security/libbeid/files/patch-common	Tue Sep 30 18:32:21 2014	(r369653)
+++ head/security/libbeid/files/patch-common	Tue Sep 30 18:34:58 2014	(r369654)
@@ -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 <malloc.h>
 -#ifdef LINUX
++#include <stdlib.h>
  #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