summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Walzer <kw@codebykevin.com>2013-09-16 01:59:36 (GMT)
committerKevin Walzer <kw@codebykevin.com>2013-09-16 01:59:36 (GMT)
commit13889d99405e5b3b703342d59b5478f51cbbd5bd (patch)
tree4e1308c4597786aca6f50151f5588544c3273f7e
parent3d9172ad682a1cfffaf9f55793a947ff05c78e57 (diff)
downloadtk-13889d99405e5b3b703342d59b5478f51cbbd5bd.zip
tk-13889d99405e5b3b703342d59b5478f51cbbd5bd.tar.gz
tk-13889d99405e5b3b703342d59b5478f51cbbd5bd.tar.bz2
Fix for http://core.tcl.tk/tk/info/8eb56719cf on broken build with 8.5.15 with clang on OS X, thanks to Ned Deily for patch
-rw-r--r--macosx/tkMacOSXClipboard.c2
-rw-r--r--macosx/tkMacOSXDraw.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/macosx/tkMacOSXClipboard.c b/macosx/tkMacOSXClipboard.c
index 7cd9c30..6ac7830 100644
--- a/macosx/tkMacOSXClipboard.c
+++ b/macosx/tkMacOSXClipboard.c
@@ -168,6 +168,7 @@ XSetSelectionOwner(
changeCount = [pb declareTypes:[NSArray array] owner:NSApp];
}
}
+ return Success;
}
/*
@@ -194,7 +195,6 @@ TkMacOSXSelDeadWindow(
if (winPtr && winPtr == (TkWindow *)clipboardOwner) {
clipboardOwner = NULL;
}
- return Success;
}
/*
diff --git a/macosx/tkMacOSXDraw.c b/macosx/tkMacOSXDraw.c
index 4eb4a88..58ae495 100644
--- a/macosx/tkMacOSXDraw.c
+++ b/macosx/tkMacOSXDraw.c
@@ -347,6 +347,7 @@ TkPutImage(
TkMacOSXDbgMsg("Invalid destination drawable");
}
TkMacOSXRestoreDrawingContext(&dc);
+ return Success;
}
/*
@@ -744,7 +745,6 @@ DrawCGImage(
} else {
TkMacOSXDbgMsg("Drawing of empty CGImage requested");
}
- return Success;
}
/*