Menu
▾
▴
[Opengtoolkit-svn] SF.net SVN: opengtoolkit:[1510] trunk/lvzip/c_source
|
From: <lab...@us...> - 2015-04-25 21:49:06
|
Revision: 1510
http://sourceforge.net/p/opengtoolkit/svn/1510
Author: labviewer
Date: 2015-04-25 21:49:03 +0000 (Sat, 25 Apr 2015)
Log Message:
-----------
Fix some more Mac compile errors
Modified Paths:
--------------
trunk/lvzip/c_source/lvutil.c
trunk/lvzip/c_source/lvutil.h
trunk/lvzip/c_source/lvzip.xcodeproj/project.pbxproj
trunk/lvzip/c_source/utf.c
trunk/lvzip/c_source/utf.h
Modified: trunk/lvzip/c_source/lvutil.c
===================================================================
--- trunk/lvzip/c_source/lvutil.c 2015-04-14 21:38:01 UTC (rev 1509)
+++ trunk/lvzip/c_source/lvutil.c 2015-04-25 21:49:03 UTC (rev 1510)
@@ -49,6 +49,7 @@
#elif MacOSX
#include <CoreFoundation/CoreFoundation.h>
#include "MacBinaryIII.h"
+ #include <sys/stat.h>
#define MacSpec FSRef
#define MacIsInvisible(cpb) ((cpb).hFileInfo.ioFlFndrInfo.fdFlags & kIsInvisible)
@@ -192,7 +193,8 @@
}
return fIOErr; /* fIOErr generally signifies some unknown file error */
}
-#elif Unix || Win32
+#endif
+
static int32 MakePathDSString(Path path, LStrPtr *lstr, int32 reserve)
{
int32 pathLen = -1;
@@ -329,7 +331,6 @@
return fIOErr; /* fIOErr generally signifies some unknown file error */
}
-#endif
#endif
LibAPI(void) DLLVersion(uChar* version)
@@ -383,7 +384,7 @@
{
MgErr err = mgNoErr;
#if MacOSX
- FInfoRec64 infoRec;
+ FInfoRec infoRec;
#elif MacOS
FSRef ref;
#elif Win32
@@ -417,11 +418,11 @@
infoRec.location.h = fileInfo->location.h;
infoRec.owner[0] = 0;
infoRec.group[0] = 0;
- err = FSetInfo64(path, &infoRec);
+ err = FSetInfo(path, &infoRec);
}
else
{
- err = FGetInfo64(path, &infoRec, kFGetInfoAll);
+ err = FGetInfo(path, &infoRec /*, kFGetInfoAll*/);
if (!err)
{
fileInfo->creator = infoRec.creator;
@@ -705,7 +706,7 @@
LibAPI(MgErr) LVPath_EncodeMacbinary(Path srcPath, Path dstPath)
{
-#if MacOS
+#if MacOS && !MacOSX
MacSpec srcFSSpec;
MacSpec dstFSSpec;
MgErr err;
@@ -727,7 +728,7 @@
LibAPI(MgErr) LVPath_DecodeMacbinary(Path srcPath, Path dstPath)
{
-#if MacOS
+#if MacOS && !MacOSX
MacSpec srcFSSpec;
MacSpec dstFSSpec;
MgErr err;
@@ -1186,6 +1187,7 @@
FSRef ref;
HFSUniStr255 forkName;
int8 perm;
+ struct stat statbuf;
char theMode[4];
OSErr ret;
#elif Win32
Modified: trunk/lvzip/c_source/lvutil.h
===================================================================
--- trunk/lvzip/c_source/lvutil.h 2015-04-14 21:38:01 UTC (rev 1509)
+++ trunk/lvzip/c_source/lvutil.h 2015-04-25 21:49:03 UTC (rev 1510)
@@ -4,6 +4,7 @@
Copyright (C) 2002-2007 Rolf Kalbermatter
*/
+#define test
#ifndef _lvUtil_H
#define _lvUtil_H
@@ -13,25 +14,86 @@
extern "C" {
#endif
+ /* Possible values for ProcessorType */
+#define kM68000 1 /* OBSOLETE */
+#define kX86 2
+#define kSparc 3
+#define kPPC 4
+#define kPARISC 5
+#define kMIPS 6
+#define kDECAlpha 7 /* OBSOLETE */
+#define kPIC 8
+#define kARM 9
+#define kX64 10
+
#if defined(macintosh) || defined(__PPCC__) || defined(THINK_C) || defined(__SC__) || defined(__MWERKS__) || defined(__APPLE_CC__)
- #define MacOS 1
#ifdef __APPLE_CC__
#define MacOSX 1
#endif
- #if defined(__i386__)
+ #if defined(__powerc) || defined(__ppc__)
+ #define ProcessorType kPPC
+ #define BigEndian 1
+ #elif defined(__i386__)
+ #define ProcessorType kX86
#define BigEndian 0
+ #elif defined(__x86_64)
+ #define ProcessorType kX64
+ #define BigEndian 0
#else
+ #define ProcessorType kM68000
#define BigEndian 1
#endif
+ #define MacOS 1
+ #ifdef __APPLE_CC__
+ #define MacOSX 1
+ #endif
#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(_WIN32_WCE)
+ #ifdef _M_PPC
+ #define ProcessorType kPPC
+ #elif defined(_M_IX86)
+ #define ProcessorType kX86
+ #elif defined(_M_X64)
+ #define ProcessorType kX64
+ #elif defined(_M_ALPHA)
+ #define ProcessorType kDECAlpha
+ #elif Compiler == kBorlandC
+ #define ProcessorType kX86
+ #elif defined(_ARM_)
+ #define ProcessorType kARM
+ #else
+ #error "We don't know the ProcessorType architecture"
+ #endif
#define Win32 1
#if defined(_DEBUG) || defined(_CVI_DEBUG_)
#define DEBUG 1
#endif
#define BigEndian 0
-#elif defined(linux)
+#elif defined(linux) || defined(__linux) || defined(__linux__)
+ #if defined(i386)
+ #define ProcessorType kX86
+ #define BigEndian 0
+ #elif defined(__alpha)
+ #define ProcessorType kDECAlpha
+ #define BigEndian 0
+ #elif defined(powerpc)
+ #define ProcessorType kPPC
+ #define BigEndian 1
+ #elif defined(sparc)
+ #define ProcessorType kSparc
+ #define BigEndian 1
+ #elif defined(mips)
+ #define ProcessorType kMIPS
+ #define BigEndian 1
+ #elif defined(arm) || defined(__arm__)
+ #define ProcessorType kARM
+ #define BigEndian 0
+ #elif defined(__x86_64__)
+ #define ProcessorType kX64
+ #define BigEndian 0
+ #else
+ #error "Unknown Linux platform"
+ #endif
#define Unix 1
- #define BigEndian 0
#define HAVE_FCNTL
#define HAVE_ICONV
#define HAVE_WCRTOMB
@@ -39,8 +101,10 @@
#define Unix 1
#define VxWorks 1
#if defined (__ppc)
+ #define ProcessorType kPPC
#define BigEndian 1
#else
+ #define ProcessorType kX86
#define BigEndian 0
#endif
#else
@@ -514,11 +578,7 @@
#endif
} FileOffset;
-LibAPI(MgErr) LVFile_OpenFile(LVRefNum *refnum,
- Path path,
- uInt8 rsrc,
- uInt32 openMode,
- uInt32 denyMode);
+LibAPI(MgErr) LVFile_OpenFile(LVRefNum *refnum, Path path, uInt8 rsrc, uInt32 openMode, uInt32 denyMode);
LibAPI(MgErr) LVFile_CloseFile(LVRefNum *refnum);
LibAPI(MgErr) LVFile_GetSize(LVRefNum *refnum, FileOffset *size);
LibAPI(MgErr) LVFile_SetSize(LVRefNum *refnum, FileOffset *size);
Modified: trunk/lvzip/c_source/lvzip.xcodeproj/project.pbxproj
===================================================================
--- trunk/lvzip/c_source/lvzip.xcodeproj/project.pbxproj 2015-04-14 21:38:01 UTC (rev 1509)
+++ trunk/lvzip/c_source/lvzip.xcodeproj/project.pbxproj 2015-04-25 21:49:03 UTC (rev 1510)
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 42;
+ objectVersion = 44;
objects = {
/* Begin PBXBuildFile section */
@@ -29,7 +29,6 @@
839542DD0894F2490020C3E2 /* zlib.h in Headers */ = {isa = PBXBuildFile; fileRef = 839542A60894F2490020C3E2 /* zlib.h */; };
839542DF0894F2490020C3E2 /* zip.h in Headers */ = {isa = PBXBuildFile; fileRef = 839542A80894F2490020C3E2 /* zip.h */; };
839542E00894F2490020C3E2 /* zip.c in Sources */ = {isa = PBXBuildFile; fileRef = 839542A90894F2490020C3E2 /* zip.c */; };
- 839542E10894F2490020C3E2 /* zconf.in.h in Headers */ = {isa = PBXBuildFile; fileRef = 839542AA0894F2490020C3E2 /* zconf.in.h */; };
839542E20894F2490020C3E2 /* zconf.h in Headers */ = {isa = PBXBuildFile; fileRef = 839542AB0894F2490020C3E2 /* zconf.h */; };
839542E30894F2490020C3E2 /* unzip.h in Headers */ = {isa = PBXBuildFile; fileRef = 839542AC0894F2490020C3E2 /* unzip.h */; };
839542E40894F2490020C3E2 /* unzip.c in Sources */ = {isa = PBXBuildFile; fileRef = 839542AD0894F2490020C3E2 /* unzip.c */; };
@@ -46,8 +45,6 @@
888E743A1ADD96A900C5AEFE /* utf.c in Sources */ = {isa = PBXBuildFile; fileRef = 888E74391ADD96A900C5AEFE /* utf.c */; };
888E743C1ADD96C200C5AEFE /* utf.h in Headers */ = {isa = PBXBuildFile; fileRef = 888E743B1ADD96C200C5AEFE /* utf.h */; };
888E743E1ADD96D700C5AEFE /* lvapi.c in Sources */ = {isa = PBXBuildFile; fileRef = 888E743D1ADD96D700C5AEFE /* lvapi.c */; };
- C77CC6BF0C9C7D3200886AB2 /* liblvexports.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C77CC6BE0C9C7D3200886AB2 /* liblvexports.a */; };
- C77CC6C20C9C7D6500886AB2 /* liblabviewcin.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C77CC6C10C9C7D6500886AB2 /* liblabviewcin.a */; };
C79368AC0C9ED687006083BF /* iomem.c in Sources */ = {isa = PBXBuildFile; fileRef = C79368AA0C9ED687006083BF /* iomem.c */; };
C79368AD0C9ED687006083BF /* iomem.h in Headers */ = {isa = PBXBuildFile; fileRef = C79368AB0C9ED687006083BF /* iomem.h */; };
/* End PBXBuildFile section */
@@ -75,7 +72,6 @@
839542A60894F2490020C3E2 /* zlib.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = zlib.h; sourceTree = "<group>"; };
839542A80894F2490020C3E2 /* zip.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = zip.h; sourceTree = "<group>"; };
839542A90894F2490020C3E2 /* zip.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = zip.c; sourceTree = "<group>"; };
- 839542AA0894F2490020C3E2 /* zconf.in.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = zconf.in.h; sourceTree = "<group>"; };
839542AB0894F2490020C3E2 /* zconf.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = zconf.h; sourceTree = "<group>"; };
839542AC0894F2490020C3E2 /* unzip.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = unzip.h; sourceTree = "<group>"; };
839542AD0894F2490020C3E2 /* unzip.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = unzip.c; sourceTree = "<group>"; };
@@ -93,8 +89,6 @@
888E74391ADD96A900C5AEFE /* utf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = utf.c; sourceTree = "<group>"; };
888E743B1ADD96C200C5AEFE /* utf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utf.h; sourceTree = "<group>"; };
888E743D1ADD96D700C5AEFE /* lvapi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = lvapi.c; sourceTree = "<group>"; };
- C77CC6BE0C9C7D3200886AB2 /* liblvexports.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblvexports.a; path = "/Applications/National Instruments/LabVIEW 8.2/cintools/Mach-O/liblvexports.a"; sourceTree = "<absolute>"; };
- C77CC6C10C9C7D6500886AB2 /* liblabviewcin.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblabviewcin.a; path = "/Applications/National Instruments/LabVIEW 8.2/cintools/Mach-O/liblabviewcin.a"; sourceTree = "<absolute>"; };
C79368AA0C9ED687006083BF /* iomem.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = iomem.c; sourceTree = "<group>"; };
C79368AB0C9ED687006083BF /* iomem.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = iomem.h; sourceTree = "<group>"; };
/* End PBXFileReference section */
@@ -106,8 +100,6 @@
files = (
83D3E26D080D117700DE332C /* Carbon.framework in Frameworks */,
836583B4088D13980083EC20 /* System.framework in Frameworks */,
- C77CC6BF0C9C7D3200886AB2 /* liblvexports.a in Frameworks */,
- C77CC6C20C9C7D6500886AB2 /* liblabviewcin.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -119,8 +111,6 @@
children = (
C79368AA0C9ED687006083BF /* iomem.c */,
C79368AB0C9ED687006083BF /* iomem.h */,
- C77CC6C10C9C7D6500886AB2 /* liblabviewcin.a */,
- C77CC6BE0C9C7D3200886AB2 /* liblvexports.a */,
83D3E1B5080D116E00DE332C /* zlib Sources */,
83D3E26B080D117700DE332C /* Frameworks */,
83D3E19A080D116E00DE332C /* Products */,
@@ -162,7 +152,6 @@
839542A60894F2490020C3E2 /* zlib.h */,
839542A80894F2490020C3E2 /* zip.h */,
839542A90894F2490020C3E2 /* zip.c */,
- 839542AA0894F2490020C3E2 /* zconf.in.h */,
839542AB0894F2490020C3E2 /* zconf.h */,
839542AC0894F2490020C3E2 /* unzip.h */,
839542AD0894F2490020C3E2 /* unzip.c */,
@@ -207,7 +196,6 @@
839542DB0894F2490020C3E2 /* inftrees.h in Headers */,
839542DD0894F2490020C3E2 /* zlib.h in Headers */,
839542DF0894F2490020C3E2 /* zip.h in Headers */,
- 839542E10894F2490020C3E2 /* zconf.in.h in Headers */,
839542E20894F2490020C3E2 /* zconf.h in Headers */,
839542E30894F2490020C3E2 /* unzip.h in Headers */,
839542E60894F2490020C3E2 /* trees.h in Headers */,
@@ -306,7 +294,7 @@
C77CC6B50C9C7C6500886AB2 /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+ ARCHS = "$(ARCHS_STANDARD_64_BIT)";
COPY_PHASE_STRIP = NO;
GCC_ALTIVEC_EXTENSIONS = NO;
GCC_CHAR_IS_UNSIGNED_CHAR = NO;
@@ -325,12 +313,7 @@
GCC_WARN_UNUSED_PARAMETER = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "";
- LIBRARY_SEARCH_PATHS = (
- "$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
- "$(LIBRARY_SEARCH_PATHS_QUOTED_2)",
- );
- LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SYSTEM_APPS_DIR)/National Instruments/LabVIEW 2009/cintools/Mach-O\"";
- LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SYSTEM_APPS_DIR)/National Instruments/LabVIEW 2009/cintools/Mach-O\"";
+ LIBRARY_SEARCH_PATHS = "$(SYSTEM_APPS_DIR)/National\\ Instruments/LabVIEW\\ 2014/cintools/Mach-O";
LIBRARY_STYLE = DYNAMIC;
MACH_O_TYPE = mh_dylib;
MACOSX_DEPLOYMENT_TARGET = 10.8;
@@ -338,12 +321,13 @@
OTHER_LDFLAGS = (
"-multiply_defined",
warning,
+ "-llvexports",
);
OTHER_REZFLAGS = "";
PRODUCT_NAME = lvzlib;
REZ_SCRIPT_TYPE = Roman;
REZ_SUPPRESS_REDECLARED_RESOURCE_TYPE_WARNINGS = NO;
- SDKROOT = macosx10.9;
+ SDKROOT = macosx10.8;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = (
"-Wmost",
@@ -357,7 +341,7 @@
C77CC6B60C9C7C6500886AB2 /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+ ARCHS = "$(ARCHS_STANDARD_64_BIT)";
COPY_PHASE_STRIP = YES;
GCC_ALTIVEC_EXTENSIONS = NO;
GCC_CHAR_IS_UNSIGNED_CHAR = NO;
@@ -373,12 +357,7 @@
GCC_WARN_UNUSED_PARAMETER = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "";
- LIBRARY_SEARCH_PATHS = (
- "$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
- "$(LIBRARY_SEARCH_PATHS_QUOTED_2)",
- );
- LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SYSTEM_APPS_DIR)/National Instruments/LabVIEW 2009/cintools/Mach-O\"";
- LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SYSTEM_APPS_DIR)/National Instruments/LabVIEW 2009/cintools/Mach-O\"";
+ LIBRARY_SEARCH_PATHS = "$(SYSTEM_APPS_DIR)/National\\ Instruments/LabVIEW\\ 2014/cintools/Mach-O";
LIBRARY_STYLE = DYNAMIC;
MACH_O_TYPE = mh_dylib;
MACOSX_DEPLOYMENT_TARGET = 10.8;
@@ -386,12 +365,13 @@
OTHER_LDFLAGS = (
"-multiply_defined",
warning,
+ "-llvexports",
);
OTHER_REZFLAGS = "";
PRODUCT_NAME = lvzlib;
REZ_SCRIPT_TYPE = Roman;
REZ_SUPPRESS_REDECLARED_RESOURCE_TYPE_WARNINGS = NO;
- SDKROOT = macosx10.9;
+ SDKROOT = macosx10.8;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = (
"-Wmost",
@@ -405,7 +385,7 @@
C77CC6B70C9C7C6500886AB2 /* Default */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+ ARCHS = "$(ARCHS_STANDARD_64_BIT)";
GCC_ALTIVEC_EXTENSIONS = NO;
GCC_CHAR_IS_UNSIGNED_CHAR = NO;
GCC_ENABLE_CPP_EXCEPTIONS = NO;
@@ -419,12 +399,7 @@
GCC_WARN_UNUSED_PARAMETER = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "";
- LIBRARY_SEARCH_PATHS = (
- "$(LIBRARY_SEARCH_PATHS_QUOTED_1)",
- "$(LIBRARY_SEARCH_PATHS_QUOTED_2)",
- );
- LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SYSTEM_APPS_DIR)/National Instruments/LabVIEW 2009/cintools/Mach-O\"";
- LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SYSTEM_APPS_DIR)/National Instruments/LabVIEW 2009/cintools/Mach-O\"";
+ LIBRARY_SEARCH_PATHS = "$(SYSTEM_APPS_DIR)/National\\ Instruments/LabVIEW\\ 2014/cintools/Mach-O";
LIBRARY_STYLE = DYNAMIC;
MACH_O_TYPE = mh_dylib;
MACOSX_DEPLOYMENT_TARGET = 10.8;
@@ -432,12 +407,13 @@
OTHER_LDFLAGS = (
"-multiply_defined",
warning,
+ "-llvexports",
);
OTHER_REZFLAGS = "";
PRODUCT_NAME = lvzlib;
REZ_SCRIPT_TYPE = Roman;
REZ_SUPPRESS_REDECLARED_RESOURCE_TYPE_WARNINGS = NO;
- SDKROOT = macosx10.9;
+ SDKROOT = macosx10.8;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = (
"-Wmost",
@@ -450,18 +426,59 @@
C77CC6B90C9C7C6500886AB2 /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ "ADDITIONAL_SDKS[arch=i386]" = "";
+ ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+ GCC_CHAR_IS_UNSIGNED_CHAR = YES;
+ HEADER_SEARCH_PATHS = (
+ "$(inherited)",
+ /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
+ "/Applications/National\\ Instruments/LabVIEW\\ 2014/cintools",
+ );
+ LD_DYLIB_INSTALL_NAME = lvzlib.framework;
+ LIBRARY_SEARCH_PATHS = "/Application/National\\ Instruments/LabVIEW\\ 2014/cintools";
+ MACH_O_TYPE = mh_dylib;
+ MACOSX_DEPLOYMENT_TARGET = 10.7;
+ ONLY_ACTIVE_ARCH = NO;
+ SDKROOT = macosx10.8;
};
name = Development;
};
C77CC6BA0C9C7C6500886AB2 /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+ GCC_CHAR_IS_UNSIGNED_CHAR = YES;
+ HEADER_SEARCH_PATHS = (
+ "$(inherited)",
+ /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
+ "/Applications/National\\ Instruments/LabVIEW\\ 2014/cintools",
+ );
+ LD_DYLIB_INSTALL_NAME = lvzlib.framework;
+ LIBRARY_SEARCH_PATHS = "/Application/National\\ Instruments/LabVIEW\\ 2014/cintools";
+ MACH_O_TYPE = mh_dylib;
+ MACOSX_DEPLOYMENT_TARGET = 10.7;
+ ONLY_ACTIVE_ARCH = NO;
+ SDKROOT = macosx10.8;
};
name = Deployment;
};
C77CC6BB0C9C7C6500886AB2 /* Default */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ "ADDITIONAL_SDKS[arch=*]" = "";
+ ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+ GCC_CHAR_IS_UNSIGNED_CHAR = YES;
+ HEADER_SEARCH_PATHS = (
+ "$(inherited)",
+ /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
+ "/Applications/National\\ Instruments/LabVIEW\\ 2014/cintools",
+ );
+ LD_DYLIB_INSTALL_NAME = lvzlib.framework;
+ LIBRARY_SEARCH_PATHS = "/Application/National\\ Instruments/LabVIEW\\ 2014/cintools";
+ MACH_O_TYPE = mh_dylib;
+ MACOSX_DEPLOYMENT_TARGET = 10.7;
+ ONLY_ACTIVE_ARCH = NO;
+ SDKROOT = macosx10.8;
};
name = Default;
};
Modified: trunk/lvzip/c_source/utf.c
===================================================================
--- trunk/lvzip/c_source/utf.c 2015-04-14 21:38:01 UTC (rev 1509)
+++ trunk/lvzip/c_source/utf.c 2015-04-25 21:49:03 UTC (rev 1510)
@@ -16,42 +16,49 @@
// Maximum valid value for a Unicode code point
#define CODE_POINT_MAX 0x0010ffffu
-__inline uInt8 utf8_mask(uInt8 oc)
+static MgErr utf8_is_valid(const uInt8 *src, int32 *offset, int32 length);
+static MgErr utf8_replace_invalid(const uInt8 *src, int32 *soff, int32 slen, uInt8 *dest, int32 *doff, int32 dlen, uInt32 replacement);
+static MgErr utf8_advance(const uInt8 *src, int32 *offset, int32 length, int32 distance);
+static MgErr utf8_distance(const uInt8 *src, int32 *offset, int32 length);
+
+static uInt8 utf8_mask(uInt8 oc)
{
return (uInt8)(0xff & oc);
}
-__inline uInt16 utf16_mask(uInt16 oc)
+static uInt16 utf16_mask(uInt16 oc)
{
return (uInt16)(0xffff & oc);
}
-__inline LVBoolean utf8_is_trail(uInt8 oc)
+static LVBoolean utf8_is_trail(uInt8 oc)
{
return ((utf8_mask(oc) >> 6) == 0x2);
}
-__inline LVBoolean utf16_is_lead_surrogate(uInt16 cp)
+static LVBoolean utf16_is_lead_surrogate(uInt16 cp)
{
return (LVBoolean)(cp >= LEAD_SURROGATE_MIN && cp <= LEAD_SURROGATE_MAX);
}
-__inline LVBoolean utf16_is_trail_surrogate(uInt16 cp)
+/*
+static LVBoolean utf16_is_trail_surrogate(uInt16 cp)
{
return (LVBoolean)(cp >= TRAIL_SURROGATE_MIN && cp <= TRAIL_SURROGATE_MAX);
}
+*/
-__inline LVBoolean utf32_is_surrogate(uInt32 cp)
+static LVBoolean utf32_is_surrogate(uInt32 cp)
{
return (LVBoolean)(cp >= LEAD_SURROGATE_MIN && cp <= TRAIL_SURROGATE_MAX);
}
-__inline LVBoolean utf32_is_code_point_valid(uInt32 cp)
+static LVBoolean utf32_is_code_point_valid(uInt32 cp)
{
return (LVBoolean)(cp <= CODE_POINT_MAX && !utf32_is_surrogate(cp));
}
-__inline int32 utf8_sequence_length(uInt8 oc)
+static int32 utf8_sequence_length(uInt8 oc)
{
uInt8 lead = utf8_mask(oc);
if (lead < 0x80)
@@ -65,7 +72,7 @@
return 0;
}
-__inline LVBoolean utf32_is_overlong_sequence(uInt32 cp, int32 length)
+static LVBoolean utf32_is_overlong_sequence(uInt32 cp, int32 length)
{
if (cp < 0x80)
{
@@ -355,7 +362,7 @@
return err;
}
-MgErr utf8_replace_invalid(const uInt8 *src, int32 *soff, int32 slen, uInt8 *dest, int32 *doff, int32 dlen, uInt32 replacement)
+static MgErr utf8_replace_invalid(const uInt8 *src, int32 *soff, int32 slen, uInt8 *dest, int32 *doff, int32 dlen, uInt32 replacement)
{
MgErr err = mgNoErr;
while (src[*soff] && (slen < 0 || *soff < slen))
@@ -388,7 +395,7 @@
return err;
}
-MgErr utf8_is_valid(const uInt8 *src, int32 *offset, int32 length)
+static MgErr utf8_is_valid(const uInt8 *src, int32 *offset, int32 length)
{
MgErr err = mgNoErr;
while (!err && src[*offset] && (length < 0 || *offset < length))
@@ -512,15 +519,16 @@
#endif
}
+static wchar_t testchar = 0x00B0;
+
LibAPI(LVBoolean) utf8_is_current_mbcs()
{
- static wchar_t test = 0x00B0;
LVBoolean is_utf8 = LV_FALSE;
char *result = malloc(MB_CUR_MAX);
if (result)
{
- int len = wctomb(NULL, test);
- len = wctomb(result, test);
+ int len = wctomb(NULL, testchar);
+ len = wctomb(result, testchar);
if ((len == 2) && (result[0] == (char)0xC2) && (result[1] == (char)0xB0))
is_utf8 = LV_TRUE;
free(result);
Modified: trunk/lvzip/c_source/utf.h
===================================================================
--- trunk/lvzip/c_source/utf.h 2015-04-14 21:38:01 UTC (rev 1509)
+++ trunk/lvzip/c_source/utf.h 2015-04-25 21:49:03 UTC (rev 1510)
@@ -9,7 +9,7 @@
extern "C" {
#endif
-LibAPI(LVBoolean) utf8_is_current_mbcs();
+LibAPI(LVBoolean) utf8_is_current_mbcs(void);
MgErr utf8_validate_next(const uInt8 *src, int32 *offset, int32 length, uInt32 *code_point);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
