gnustep/libs-gdl2
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gdl2.git synced 2025-04-22 21:00:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Correct build of GDL2 so that it works properly with the latest versions of both libs-base and the new InterfaceBuilder library for the palette

Browse source
This commit is contained in:
Gregory John Casamento 2025-01-12 04:20:09 -05:00
parent d5f0d94b4b
commit 1066329038
7 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
EOControl/EOClassDescription.m
View file

@ -50,6 +50,7 @@
#include <Foundation/NSZone.h>
#include <Foundation/NSObjCRuntime.h>
#include <Foundation/NSDebug.h>
#include <Foundation/NSLock.h>
#else
#include <Foundation/Foundation.h>
#endif
@ -60,8 +61,6 @@
#include <GNUstepBase/NSObject+GNUstepBase.h>
#endif
#include <GNUstepBase/GSLock.h>
#include <EOControl/EOClassDescription.h>
#include <EOControl/EOKeyValueCoding.h>
#include <EOControl/EONull.h>
@ -126,7 +125,7 @@ static NSRecursiveLock *local_lock = nil;
cls = NSClassFromString(@"EOModelGroup");
local_lock = [GSLazyRecursiveLock new];
local_lock = [NSRecursiveLock new];
classDescriptionForClass = NSCreateMapTable(NSObjectMapKeyCallBacks,
NSObjectMapValueCallBacks,
32);

6
EOControl/EOEditingContext.m
View file

@ -41,8 +41,6 @@
#include <Foundation/Foundation.h>
#include <GNUstepBase/GSLock.h>
#include "EOEditingContext.h"
#include "EOSharedEditingContext.h"
#include "EOObjectStoreCoordinator.h"
@ -118,7 +116,7 @@
@interface EOThreadSafeQueue : NSObject
{
GSLazyRecursiveLock *lock;
NSRecursiveLock *lock;
NSMutableArray *arr;
}
-(void)addItem:(id)object;
@ -130,7 +128,7 @@
{
if ((self=[super init]))
{
lock = [GSLazyRecursiveLock new];
lock = [NSRecursiveLock new];
arr = [NSMutableArray new];
}
return self;

5
EOControl/EOGenericRecord.m
View file

@ -46,6 +46,7 @@
#include <Foundation/NSValue.h>
#include <Foundation/NSHashTable.h>
#include <Foundation/NSDebug.h>
#include <Foundation/NSLock.h>
#else
#include <Foundation/Foundation.h>
#endif
@ -56,7 +57,7 @@
#include <GNUstepBase/NSDebug+GNUstepBase.h>
#endif
#include <GNUstepBase/GSLock.h>
// #include <GNUstepBase/GSLock.h>
#include <EOControl/EOClassDescription.h>
#include <EOControl/EOGenericRecord.h>
@ -122,7 +123,7 @@ static NSRecursiveLock *allGenericRecordsLock = nil;
allGenericRecords = NSCreateHashTable(NSNonOwnedPointerHashCallBacks,
1000);
allGenericRecordsLock = [GSLazyRecursiveLock new];
allGenericRecordsLock = [NSRecursiveLock new];
}
}

3
EOControl/EONSAddOns.m
View file

@ -54,7 +54,6 @@
#include <GNUstepBase/NSDebug+GNUstepBase.h>
#endif
#include <GNUstepBase/Unicode.h>
#include <GNUstepBase/GSLock.h>
#include <EOControl/EONSAddOns.h>
#include <EOControl/EODebug.h>
@ -81,7 +80,7 @@ GSUseStrictWO451Compatibility (NSString *key)
{
if (local_lock == nil)
{
NSRecursiveLock *l = [GSLazyRecursiveLock new];
NSRecursiveLock *l = [NSRecursiveLock new];
GDL2_AssignAtomicallyIfNil(&local_lock, l);
}
[local_lock lock];

3
EOControl/EOPrivate.m
View file

@ -37,7 +37,6 @@
#define GSI_ARRAY_NO_RETAIN 1
#define GSI_ARRAY_NO_RELEASE 1
#include <GNUstepBase/GSIArray.h>
#include <GNUstepBase/GSLock.h>
#ifndef GNUSTEP
#include <GNUstepBase/Additions.h>
@ -119,7 +118,7 @@ void GDL2_PrivateInit()
{
initialized = YES;
GDL2_Lock = [GSLazyRecursiveLock new];
GDL2_Lock = [NSRecursiveLock new];
// ==== Classes ====
GDL2_NSArrayClass=[NSArray class];

6
EOControl/EOSharedEditingContext.m
View file

@ -39,8 +39,6 @@
#include <Foundation/NSUndoManager.h>
#endif
#include <GNUstepBase/GSLock.h>
#include "EOSharedEditingContext.h"
#include "EOFault.h"
#include "EOFetchSpecification.h"
@ -91,7 +89,7 @@ static NSRecursiveLock *llock = nil;
{
emptyArray = [NSArray new];
EOFaultClass = [EOFault class];
llock = [GSLazyRecursiveLock new];
llock = [NSRecursiveLock new];
}
}
@ -171,7 +169,7 @@ static EOSharedEditingContext *dfltSharedEditingContext = nil;
if ((self = [super initWithParentObjectStore: parentObjectStore]))
{
NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
_sharedLock = [GSLazyRecursiveLock new];
_sharedLock = [NSRecursiveLock new];
_initializedGlobalIDs = [NSMutableArray new];
_objsByEntity = [NSMutableDictionary new];
_objsByEntityFetchSpec = [NSMutableDictionary new];

2
GDL2Palette/GNUmakefile
View file

@ -51,6 +51,6 @@ GDL2_OBJC_FILES= \
KeyWrapper.m \
DisplayGroupInspector.m
PALETTE_LIBS=$(ADDITIONAL_OBJC_LIBS) -lGorm
PALETTE_LIBS=$(ADDITIONAL_OBJC_LIBS) -lInterfaceBuilder
include $(GNUSTEP_MAKEFILES)/palette.make