76eb6ae3ac
- bug 145 "p7zip crashes while moving memory in MoveItems
Version 9.38
- patch 23 fixes "7z with unicode file name with surrogate pair is not handled well in Linux"
- bug 139 "password from commanline is visible in processes list"
Now the characters of the password are replaced with *.
- From Windows version of 7-zip
- bug138 If you extract the password with # program crashes
7z now supports long password in RAR 3 and 4.
51 lines
1.4 KiB
C++
51 lines
1.4 KiB
C++
$NetBSD: patch-CPP_Windows_DLL.cpp,v 1.2 2015/06/02 14:53:10 adam Exp $
|
|
|
|
Adapt for pkgsrc on OS X.
|
|
|
|
--- CPP/Windows/DLL.cpp.orig 2011-07-09 16:25:31.000000000 +0000
|
|
+++ CPP/Windows/DLL.cpp
|
|
@@ -2,7 +2,7 @@
|
|
|
|
#include "StdAfx.h"
|
|
|
|
-#ifdef __APPLE_CC__
|
|
+#if defined(USE_APPLE_BUNDLE)
|
|
#include <mach-o/dyld.h>
|
|
#elif ENV_BEOS
|
|
#include <kernel/image.h>
|
|
@@ -34,7 +34,7 @@ TRACEN((printf("CLibrary::Free(this=%p,%
|
|
if (_module == 0)
|
|
return true;
|
|
|
|
-#ifdef __APPLE_CC__
|
|
+#if defined(USE_APPLE_BUNDLE)
|
|
int ret = NSUnLinkModule ((NSModule)_module, 0);
|
|
#elif ENV_BEOS
|
|
int ret = unload_add_on((image_id)_module);
|
|
@@ -52,7 +52,7 @@ static FARPROC local_GetProcAddress(HMOD
|
|
void *ptr = 0;
|
|
TRACEN((printf("local_GetProcAddress(%p,%s)\n",(void *)module,lpProcName)))
|
|
if (module) {
|
|
-#ifdef __APPLE_CC__
|
|
+#if defined(USE_APPLE_BUNDLE)
|
|
char name[MAX_PATHNAME_LEN];
|
|
snprintf(name,sizeof(name),"_%s",lpProcName);
|
|
name[sizeof(name)-1] = 0;
|
|
@@ -103,7 +103,7 @@ bool CLibrary::Load(LPCTSTR lpLibFileNam
|
|
|
|
TRACEN((printf("CLibrary::Load(this=%p,%ls) => %s\n",(void *)this,lpLibFileName,name)))
|
|
|
|
-#ifdef __APPLE_CC__
|
|
+#if defined(USE_APPLE_BUNDLE)
|
|
NSObjectFileImage image;
|
|
NSObjectFileImageReturnCode nsret;
|
|
|
|
@@ -161,7 +161,7 @@ TRACEN((printf("load_add_on(%s)=%d\n",p.
|
|
if (fctTest) fctTest();
|
|
|
|
} else {
|
|
-#ifdef __APPLE_CC__
|
|
+#if defined(USE_APPLE_BUNDLE)
|
|
NSLinkEditErrors c;
|
|
int num_err;
|
|
const char *file,*err;
|