@@ -18,7 +18,8 @@ endif #endif DLL_SUFFIX := so -DLL_COMMAND := -shared -Wl,-soname="libiovmall.so" +#DLL_COMMAND := -shared -Wl,-soname="libiovmall.so" +DLL_COMMAND := -shared -Wl,-soname="/usr/local/lib/libiovmall.so" FLAT_NAMESPACE := LINKDLL := $(CC) Makefile @@ -89,7 +89,7 @@ void CHash_setEqualFunc_(CHash *self, CHashEqualFunc *f) int CHash_insert_(CHash *self, CHashRecord *x) { int n; - size_t pos; + //size_t pos; //printf("insert\n"); for (n = 0; n < CHASH_MAXLOOP; n ++) libs/basekit/source/CHash.c @@ -44,7 +44,6 @@ BASEKIT_API void CHash_setHash1Func_(CHash *self, CHashHashFunc *f); BASEKIT_API void CHash_setHash2Func_(CHash *self, CHashHashFunc *f); BASEKIT_API void CHash_setEqualFunc_(CHash *self, CHashEqualFunc *f); -BASEKIT_API int CHash_at_put_(CHash *self, void *k, void *v); BASEKIT_API void CHash_removeKey_(CHash *self, void *k); BASEKIT_API size_t CHash_size(CHash *self); // actually the keyCount @@ -56,7 +55,6 @@ BASEKIT_API void CHash_compact(CHash *self); BASEKIT_API void CHash_setSize_(CHash *self, size_t size); BASEKIT_API int CHash_insert_(CHash *self, CHashRecord *x); BASEKIT_API void CHash_grow(CHash *self); -BASEKIT_API void CHash_shrinkIfNeeded(CHash *self); BASEKIT_API void CHash_shrink(CHash *self); BASEKIT_API void CHash_show(CHash *self); BASEKIT_API void CHash_updateMask(CHash *self); libs/basekit/source/CHash.h @@ -159,7 +159,6 @@ void MemoryBlock_free(MemoryBlock *self) MemoryBlock_remove(self); allocatedBytes -= self->size; frees ++; - memset(self, 0, self->size); // zero out the memory free(self); } libs/basekit/source/Common.c @@ -27,8 +27,15 @@ Kudos to Daniel A. Koepke #include "TargetConditionals.h" #endif -//#if defined __GNUC__ && __GNUC__ >= 4 -#if defined TARGET_ASPEN_SIMULATOR || TARGET_OS_ASPEN +#if defined __XCODE__ && (TARGET_ASPEN_SIMULATOR || TARGET_OS_ASPEN) + #define NON_EXTERN_INLINES +#else + #if defined __GNUC__ && __GNUC__ >= 4 + //#define NON_EXTERN_INLINES + #endif +#endif + +#ifdef NON_EXTERN_INLINES #ifdef IO_IN_C_FILE // in .c libs/basekit/source/Common_inline.h @@ -131,11 +131,13 @@ int chdir(const char *path) int isDirectory(struct dirent *dp, char *path) { #ifdef DT_UNKNOWN - if (dp->d_type != DT_UNKNOWN) + if (dp->d_type == DT_UNKNOWN) return 0; + /*if (dp->d_type != DT_UNKNOWN) { - return (dp->d_type == DT_DIR); + return (dp->d_type == DT_DIR) || (dp->d_type == DT_LNK); } else + */ #endif { struct stat st; libs/iovm/source/IoDirectory.c d93b329f81703497653db5ed049abbedf4cb90f5 Steve Dekorte steve@StevesLaptop-7.local http://github.com/stevedekorte/io/commit/77b91dee5ff4fc3a0f659b5713cd4e80f8431540 77b91dee5ff4fc3a0f659b5713cd4e80f8431540 2009-07-07T00:00:20-07:00 2009-07-07T00:00:20-07:00 latest bc2c97a254c7cd5664a04a30c18d929f2d848647 Steve Dekorte steve@StevesLaptop-7.local