Author: wlux
Date: Thu Dec 15 11:59:09 2016
New Revision: 40264
URL: http://svn.gna.org/viewcvs/gnustep?rev=40264&view=rev
Log:
Change mlock in NSWorkspace into a private variable to avoid name
conflict with a libc function on Linux.
Modified:
libs/gui/trunk/ChangeLog
libs/gui/trunk/Source/NSWorkspace.m
Modified: libs/gui/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/ChangeLog?rev=40264&r1=40263&r2=40264&view=diff
==============================================================================
--- libs/gui/trunk/ChangeLog (original)
+++ libs/gui/trunk/ChangeLog Thu Dec 15 11:59:09 2016
@@ -1,3 +1,8 @@
+2016-12-15 Wolfgang Lux <[email protected]>
+
+ * Source/NSWorkspace.m: Change mlock into a private variable to
+ avoid name conflict with a libc function on Linux.
+
2016-11-21 Fred Kiefer <[email protected]>
* Headers/AppKit/NSColorPanel.h: Change -alpha to CGFloat.
Modified: libs/gui/trunk/Source/NSWorkspace.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Source/NSWorkspace.m?rev=40264&r1=40263&r2=40264&view=diff
==============================================================================
--- libs/gui/trunk/Source/NSWorkspace.m (original)
+++ libs/gui/trunk/Source/NSWorkspace.m Thu Dec 15 11:59:09 2016
@@ -111,7 +111,7 @@
static NSImage *unknownApplication = nil;
static NSImage *unknownTool = nil;
-NSLock *mlock = nil;
+static NSLock *mlock = nil;
static NSString *GSWorkspaceNotification = @"GSWorkspaceNotification";
static NSString *GSWorkspacePreferencesChanged =
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
