Fix to ensure correct version of mheader fiel is imported

2025-05-30 00:11:26 +00:00 · 2023-10-30 14:30:06 +00:00 · 2023-10-30 14:30:06 +00:00 · 8b4a8820a8
commit 8b4a8820a8
parent 1cce7e97e2
28 changed files with 63 additions and 62 deletions
--- a/Source/GSInvocation.h
+++ b/Source/GSInvocation.h
@ -25,7 +25,7 @@
 #ifndef __GSInvocation_h_GNUSTEP_BASE_INCLUDE
 #define __GSInvocation_h_GNUSTEP_BASE_INCLUDE

-#include <Foundation/NSInvocation.h>
+#import "Foundation/NSInvocation.h"

@class	NSMutableData;

--- a/Source/GSPrivate.h
+++ b/Source/GSPrivate.h
@ -54,9 +54,9 @@

 NSTimeInterval   GSPrivateTimeNow() GS_ATTRIB_PRIVATE;

-#include "GNUstepBase/GSObjCRuntime.h"
+#import "GNUstepBase/GSObjCRuntime.h"

-#include "Foundation/NSArray.h"
+#import "Foundation/NSArray.h"

 #ifdef __GNUSTEP_RUNTIME__
 struct objc_category;
@ -87,7 +87,7 @@ typedef struct objc_category* Category;
 }
@end

-#include "Foundation/NSString.h"
+#import "Foundation/NSString.h"

 /**
 * Macro to manage memory for chunks of code that need to work with
--- a/Source/NSAppleEventDescriptor.m
+++ b/Source/NSAppleEventDescriptor.m
@ -22,7 +22,7 @@
   Boston, MA 02110 USA.
 */

-#include <Foundation/NSAppleEventDescriptor.h>
+#import "Foundation/NSAppleEventDescriptor.h"

@implementation NSAppleEventDescriptor

--- a/Source/NSAppleEventManager.m
+++ b/Source/NSAppleEventManager.m
@ -22,7 +22,7 @@
   Boston, MA 02110 USA.
 */

-#include <Foundation/NSAppleEventManager.h>
+#import "Foundation/NSAppleEventManager.h"

@implementation NSAppleEventManager

--- a/Source/NSAppleScript.m
+++ b/Source/NSAppleScript.m
@ -23,7 +23,7 @@
   Boston, MA 02110 USA.
 */

-#include <Foundation/NSAppleScript.h>
+#import "Foundation/NSAppleScript.h"

@implementation NSAppleScript

--- a/Source/NSCallBacks.h
+++ b/Source/NSCallBacks.h
@ -29,8 +29,8 @@

 /**** Included Headers *******************************************************/

-#include "Foundation/NSObject.h"
-#include "Foundation/NSString.h"
+#import "Foundation/NSObject.h"
+#import "Foundation/NSString.h"


 #if ( (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) ) && HAVE_VISIBILITY_ATTRIBUTE )
--- a/Source/NSDateComponentsFormatter.m
+++ b/Source/NSDateComponentsFormatter.m
@ -22,12 +22,12 @@
   Boston, MA 02110 USA.
 */

-#include <Foundation/NSDateComponentsFormatter.h>
-#include <Foundation/NSDate.h>
-#include <Foundation/NSString.h>
-#include <Foundation/NSValue.h>
-#include <Foundation/NSException.h>
-#include <Foundation/NSNumberFormatter.h>
+#import "Foundation/NSDateComponentsFormatter.h"
+#import "Foundation/NSDate.h"
+#import "Foundation/NSString.h"
+#import "Foundation/NSValue.h"
+#import "Foundation/NSException.h"
+#import "Foundation/NSNumberFormatter.h"

@implementation NSDateComponentsFormatter

--- a/Source/NSDateInterval.m
+++ b/Source/NSDateInterval.m
@ -22,10 +22,10 @@
   Boston, MA 02110 USA.
 */

-#include <Foundation/NSDateInterval.h>
-#include <Foundation/NSDate.h>
-#include <Foundation/NSArray.h>
-#include <Foundation/NSException.h>
+#import "Foundation/NSDateInterval.h"
+#import "Foundation/NSDate.h"
+#import "Foundation/NSArray.h"
+#import "Foundation/NSException.h"

@implementation NSDateInterval

--- a/Source/NSDateIntervalFormatter.m
+++ b/Source/NSDateIntervalFormatter.m
@ -22,13 +22,13 @@
   Boston, MA 02110 USA.
 */

-#include <Foundation/NSDateIntervalFormatter.h>
-#include <Foundation/NSLocale.h>
-#include <Foundation/NSCalendar.h>
-#include <Foundation/NSTimeZone.h>
-#include <Foundation/NSString.h>
-#include <Foundation/NSDate.h>
-#include <Foundation/NSDateInterval.h>
+#import "Foundation/NSDateIntervalFormatter.h"
+#import "Foundation/NSLocale.h"
+#import "Foundation/NSCalendar.h"
+#import "Foundation/NSTimeZone.h"
+#import "Foundation/NSString.h"
+#import "Foundation/NSDate.h"
+#import "Foundation/NSDateInterval.h"

@implementation NSDateIntervalFormatter
 // Properties
--- a/Source/NSExtensionContext.m
+++ b/Source/NSExtensionContext.m
@ -22,11 +22,12 @@
   Boston, MA 02110 USA.
 */

-#include <Foundation/NSExtensionContext.h>
-#include <Foundation/NSError.h>
-#include <Foundation/NSArray.h>
-#include <Foundation/NSURL.h>
-#include <Foundation/NSString.h>
+#import "Foundation/NSExtensionContext.h"
+#import "Foundation/NSError.h"
+#import "Foundation/NSArray.h"
+#import "Foundation/NSURL.h"
+#import "Foundation/NSString.h"
+#import "GNUstepBase/NSObject+GNUstepBase.h"

@implementation NSExtensionContext

--- a/Source/NSExtensionItem.m
+++ b/Source/NSExtensionItem.m
@ -22,10 +22,10 @@
   Boston, MA 02110 USA.
 */

-#include <Foundation/NSExtensionItem.h>
-#include <Foundation/NSAttributedString.h>
-#include <Foundation/NSDictionary.h>
-#include <Foundation/NSArray.h>
+#import "Foundation/NSExtensionItem.h"
+#import "Foundation/NSAttributedString.h"
+#import "Foundation/NSDictionary.h"
+#import "Foundation/NSArray.h"

@implementation NSExtensionItem

--- a/Source/NSFileVersion.m
+++ b/Source/NSFileVersion.m
@ -23,16 +23,16 @@
   Boston, MA 02110 USA.
 */

-#include <Foundation/NSFileVersion.h>
-#include <Foundation/NSArray.h>
-#include <Foundation/NSDictionary.h>
-#include <Foundation/NSDate.h>
-#include <Foundation/NSError.h>
-#include <Foundation/NSString.h>
-#include <Foundation/NSURL.h>
-#include <Foundation/NSPersonNameComponents.h>
-#include <Foundation/NSFileManager.h>
-#include <Foundation/NSData.h>
+#import "Foundation/NSFileVersion.h"
+#import "Foundation/NSArray.h"
+#import "Foundation/NSDictionary.h"
+#import "Foundation/NSDate.h"
+#import "Foundation/NSError.h"
+#import "Foundation/NSString.h"
+#import "Foundation/NSURL.h"
+#import "Foundation/NSPersonNameComponents.h"
+#import "Foundation/NSFileManager.h"
+#import "Foundation/NSData.h"

@interface NSFileVersion (Private)
 - (void) _setURL: (NSURL *)u;
--- a/Source/NSHFSFileTypes.m
+++ b/Source/NSHFSFileTypes.m
@ -22,7 +22,7 @@
   Boston, MA 02110 USA.
 */

-#include <Foundation/NSHFSFileTypes.h>
+#import "Foundation/NSHFSFileTypes.h"

 GS_DECLARE NSString *NSFileTypeForHFSTypeCode(NSUInteger hfsFileTypeCode)
 {
--- a/Source/NSItemProviderReadingWriting.m
+++ b/Source/NSItemProviderReadingWriting.m
@ -22,7 +22,7 @@
   Boston, MA 02110 USA.
 */

-#include <Foundation/NSItemProviderReadingWriting.h>
+#import "Foundation/NSItemProviderReadingWriting.h"

@implementation NSItemProviderReadingWriting

--- a/Source/NSMetadataAttributes.m
+++ b/Source/NSMetadataAttributes.m
@ -22,8 +22,8 @@
   Boston, MA 02110 USA.
 */

-#include <Foundation/NSMetadataAttributes.h>
-#include <Foundation/NSString.h>
+#import "Foundation/NSMetadataAttributes.h"
+#import "Foundation/NSString.h"

 GS_DECLARE NSString *const NSMetadataItemAcquisitionMakeKey = @"NSMetadataItemAcquisitionMakeKey";
 GS_DECLARE NSString *const NSMetadataItemAcquisitionModelKey = @"NSMetadataItemAcquisitionModelKey";
--- a/Source/NSObjectScripting.m
+++ b/Source/NSObjectScripting.m
@ -22,7 +22,7 @@
   Boston, MA 02110 USA.
 */

-#include <Foundation/NSObjectScripting.h>
+#import "Foundation/NSObjectScripting.h"

@implementation NSObjectScripting

--- a/Source/NSScriptClassDescription.m
+++ b/Source/NSScriptClassDescription.m
@ -23,7 +23,7 @@
   Boston, MA 02110 USA.
 */

-#include <Foundation/NSScriptClassDescription.h>
+#import "Foundation/NSScriptClassDescription.h"

@implementation NSScriptClassDescription

--- a/Source/NSScriptCoercionHandler.m
+++ b/Source/NSScriptCoercionHandler.m
@ -23,7 +23,7 @@
   Boston, MA 02110 USA.
 */

-#include <Foundation/NSScriptCoercionHandler.h>
+#import "Foundation/NSScriptCoercionHandler.h"

@implementation NSScriptCoercionHandler

--- a/Source/NSScriptCommand.m
+++ b/Source/NSScriptCommand.m
@ -23,7 +23,7 @@
   Boston, MA 02110 USA.
 */

-#include <Foundation/NSScriptCommand.h>
+#import "Foundation/NSScriptCommand.h"

@implementation NSScriptCommand

--- a/Source/NSScriptCommandDescription.m
+++ b/Source/NSScriptCommandDescription.m
@ -23,7 +23,7 @@
   Boston, MA 02110 USA.
 */

-#include <Foundation/NSScriptCommandDescription.h>
+#import "Foundation/NSScriptCommandDescription.h"

@implementation NSScriptCommandDescription

--- a/Source/NSScriptExecutionContext.m
+++ b/Source/NSScriptExecutionContext.m
@ -23,7 +23,7 @@
   Boston, MA 02110 USA.
 */

-#include <Foundation/NSScriptExecutionContext.h>
+#import "Foundation/NSScriptExecutionContext.h"

@implementation NSScriptExecutionContext

--- a/Source/NSScriptKeyValueCoding.m
+++ b/Source/NSScriptKeyValueCoding.m
@ -23,7 +23,7 @@
   Boston, MA 02110 USA.
 */

-#include <Foundation/NSScriptKeyValueCoding.h>
+#import "Foundation/NSScriptKeyValueCoding.h"

@implementation NSScriptKeyValueCoding

--- a/Source/NSScriptObjectSpecifiers.m
+++ b/Source/NSScriptObjectSpecifiers.m
@ -23,7 +23,7 @@
   Boston, MA 02110 USA.
 */

-#include <Foundation/NSScriptObjectSpecifiers.h>
+#import "Foundation/NSScriptObjectSpecifiers.h"

@implementation NSScriptObjectSpecifiers

--- a/Source/NSScriptStandardSuiteCommands.m
+++ b/Source/NSScriptStandardSuiteCommands.m
@ -23,7 +23,7 @@
   Boston, MA 02110 USA.
 */

-#include <Foundation/NSScriptStandardSuiteCommands.h>
+#import "Foundation/NSScriptStandardSuiteCommands.h"

@implementation NSScriptStandardSuiteCommands

--- a/Source/NSScriptSuiteRegistry.m
+++ b/Source/NSScriptSuiteRegistry.m
@ -23,7 +23,7 @@
   Boston, MA 02110 USA.
 */

-#include <Foundation/NSScriptSuiteRegistry.h>
+#import "Foundation/NSScriptSuiteRegistry.h"

@implementation NSScriptSuiteRegistry

--- a/Source/NSUserActivity.m
+++ b/Source/NSUserActivity.m
@ -22,7 +22,7 @@
   Boston, MA 02110 USA.
 */

-#include <Foundation/NSUserActivity.h>
+#import "Foundation/NSUserActivity.h"

@implementation NSUserActivity

--- a/Source/NSUserScriptTask.m
+++ b/Source/NSUserScriptTask.m
@ -23,7 +23,7 @@
   Boston, MA 02110 USA.
 */

-#include <Foundation/NSUserScriptTask.h>
+#import "Foundation/NSUserScriptTask.h"

@implementation NSUserScriptTask

--- a/Source/objc-load.h
+++ b/Source/objc-load.h
@ -31,7 +31,7 @@
 #define __objc_load_h_INCLUDE

 #include <stdio.h>
-#include <Foundation/NSString.h>
+#include "Foundation/NSString.h"

 #ifdef HAVE_DLADDR
 #define LINKER_GETSYMBOL 1