interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

"Fixed" the weird crashes and fixed the makefile failures.

This commit is contained in:
Pietro Gagliardi 2016-01-07 15:43:35 -05:00
parent 499a93e32e
commit 9cfc133481
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/GNUbasegcc.mk
View File

@ -53,7 +53,7 @@ endif
$(OUT): $(OFILES) | $(OUTDIR) $(OUT): $(OFILES) | $(OUTDIR)
@$(reallinker) -o $(OUT) $(OFILES) $(LDFLAGS) @$(reallinker) -o $(OUT) $(OFILES) $(LDFLAGS)
ifeq ($(USESSONAME),1) ifeq ($(USESSONAME),1)
@ln -s $(NAME)$(SUFFIX) $(OUTNOSONAME) @ln -sf $(NAME)$(SUFFIX) $(OUTNOSONAME)
endif endif
@echo ====== Linked $(OUT) @echo ====== Linked $(OUT)

4
darwin/map.m
View File

@ -1,8 +1,6 @@
// 17 august 2015 // 17 august 2015
#import "uipriv_darwin.h" #import "uipriv_darwin.h"
// TODO are the NSValues (or worse, the NSMapTable) being garbage collected underfoot? crash the package ui test when closing the main window; etc.
// unfortunately NSMutableDictionary copies its keys, meaning we can't use it for pointers // unfortunately NSMutableDictionary copies its keys, meaning we can't use it for pointers
// hence, this file // hence, this file
// we could expose a NSMapTable directly, but let's treat all pointers as opaque and hide the implementation, just to be safe and prevent even more rewrites later // we could expose a NSMapTable directly, but let's treat all pointers as opaque and hide the implementation, just to be safe and prevent even more rewrites later
@ -17,6 +15,8 @@ struct mapTable *newMap(void)
m = uiNew(struct mapTable); m = uiNew(struct mapTable);
m->m = [NSMapTable mapTableWithKeyOptions:(NSPointerFunctionsOpaqueMemory | NSPointerFunctionsOpaquePersonality) m->m = [NSMapTable mapTableWithKeyOptions:(NSPointerFunctionsOpaqueMemory | NSPointerFunctionsOpaquePersonality)
valueOptions:(NSPointerFunctionsOpaqueMemory | NSPointerFunctionsOpaquePersonality)]; valueOptions:(NSPointerFunctionsOpaqueMemory | NSPointerFunctionsOpaquePersonality)];
// TODO why do I need this
[m->m retain];
return m; return m;
} }