Hide some mistakenlt external symbols

This commit is contained in:
rfm 2025-02-09 12:49:56 +00:00
parent 48f01b610d
commit 5fa8a06531
10 changed files with 35 additions and 28 deletions

View file

@ -8285,7 +8285,7 @@ typedef enum {
SMTPE_DSN, // delivery status notification extension SMTPE_DSN, // delivery status notification extension
} SMTPE; } SMTPE;
NSString * static NSString *
eventText(NSStreamEvent e) eventText(NSStreamEvent e)
{ {
if (e == NSStreamEventNone) if (e == NSStreamEventNone)
@ -8303,7 +8303,7 @@ eventText(NSStreamEvent e)
return @"unknown event"; return @"unknown event";
} }
NSString * static NSString *
statusText(NSStreamStatus s) statusText(NSStreamStatus s)
{ {
if (s == NSStreamStatusNotOpen) return @"NSStreamStatusNotOpen"; if (s == NSStreamStatusNotOpen) return @"NSStreamStatusNotOpen";

View file

@ -189,7 +189,7 @@ IMP gs_objc_msg_forward (SEL sel)
return gs_objc_msg_forward2 (nil, sel); return gs_objc_msg_forward2 (nil, sel);
} }
#ifdef __GNUSTEP_RUNTIME__ #ifdef __GNUSTEP_RUNTIME__
gs_thread_key_t thread_slot_key; static gs_thread_key_t thread_slot_key;
static struct objc_slot * static struct objc_slot *
gs_objc_msg_forward3(id receiver, SEL op) gs_objc_msg_forward3(id receiver, SEL op)
{ {

View file

@ -1,5 +1,6 @@
#import <Foundation/NSString.h> #import "Foundation/NSString.h"
#import <Foundation/NSException.h> #import "Foundation/NSException.h"
#import "GSPrivate.h"
#if defined(HAVE_UNICODE_UTEXT_H) #if defined(HAVE_UNICODE_UTEXT_H)
#include <unicode/utext.h> #include <unicode/utext.h>
@ -30,7 +31,7 @@
* The returned UText object holds a reference to the NSString and accesses its * The returned UText object holds a reference to the NSString and accesses its
* contents directly. * contents directly.
*/ */
UText* UTextInitWithNSString(UText *txt, NSString *str); UText* UTextInitWithNSString(UText *txt, NSString *str) GS_ATTRIB_PRIVATE;
/** /**
* Initialises a UText structure with an NSMutableString. If txt is NULL, then * Initialises a UText structure with an NSMutableString. If txt is NULL, then
@ -43,7 +44,8 @@ UText* UTextInitWithNSString(UText *txt, NSString *str);
* This function returns a mutable UText, and changes made to it will be * This function returns a mutable UText, and changes made to it will be
* reflected in the underlying NSMutableString. * reflected in the underlying NSMutableString.
*/ */
UText* UTextInitWithNSMutableString(UText *txt, NSMutableString *str); UText* UTextInitWithNSMutableString(UText *txt, NSMutableString *str)
GS_ATTRIB_PRIVATE;
/** /**
* GSUTextString is an NSString subclass that is backed by a libicu UText * GSUTextString is an NSString subclass that is backed by a libicu UText

View file

@ -50,7 +50,7 @@ UTextNSStringNativeLength(UText *ut)
* Loads a group of characters into the buffer that can be directly accessed by * Loads a group of characters into the buffer that can be directly accessed by
* users of the UText. This is used for iteration but UText users. * users of the UText. This is used for iteration but UText users.
*/ */
UBool static UBool
UTextNSStringAccess(UText *ut, int64_t nativeIndex, UBool forward) UTextNSStringAccess(UText *ut, int64_t nativeIndex, UBool forward)
{ {
NSString *str = (NSString*)ut->p; NSString *str = (NSString*)ut->p;
@ -223,7 +223,7 @@ UTextNSStringExtract(UText *ut,
/** /**
* Copy or move some characters within a UText. * Copy or move some characters within a UText.
*/ */
void UTextNSStringCopy(UText *ut, static void UTextNSStringCopy(UText *ut,
int64_t nativeStart, int64_t nativeStart,
int64_t nativeLimit, int64_t nativeLimit,
int64_t nativeDest, int64_t nativeDest,
@ -276,7 +276,7 @@ UTextNStringClose(UText *ut)
* Typically, this should not actually copy the underlying storage, because it * Typically, this should not actually copy the underlying storage, because it
* is immutable. * is immutable.
*/ */
UText* static UText*
UTextNSStringClone(UText *dest, UTextNSStringClone(UText *dest,
const UText *src, const UText *src,
UBool deep, UBool deep,
@ -294,7 +294,7 @@ UTextNSStringClone(UText *dest,
/** /**
* Copies the UText object, optionally copying the NSMutableString. * Copies the UText object, optionally copying the NSMutableString.
*/ */
UText* static UText*
UTextNSMutableStringClone(UText *dest, UTextNSMutableStringClone(UText *dest,
const UText *src, const UText *src,
UBool deep, UBool deep,
@ -319,7 +319,7 @@ UTextNSMutableStringClone(UText *dest,
/** /**
* Returns the index of the current character in the temporary buffer. * Returns the index of the current character in the temporary buffer.
*/ */
int64_t static int64_t
UTextNSStringMapOffsetToNative(const UText *ut) UTextNSStringMapOffsetToNative(const UText *ut)
{ {
return ut->chunkNativeStart + ut->chunkOffset; return ut->chunkNativeStart + ut->chunkOffset;

View file

@ -29,7 +29,7 @@
#import "Foundation/NSObjCRuntime.h" #import "Foundation/NSObjCRuntime.h"
#import "GSSorting.h" #import "GSSorting.h"
void static void
_GSShellSort(id *objects, _GSShellSort(id *objects,
NSRange sortRange, NSRange sortRange,
id comparisonEntity, id comparisonEntity,
@ -121,4 +121,4 @@ _GSShellSort(id *objects,
_GSSortUnstable = _GSShellSort; _GSSortUnstable = _GSShellSort;
} }
@end @end

View file

@ -45,7 +45,7 @@ typedef NSUInteger GSComparisonType;
* GNUstep. * GNUstep.
*/ */
extern void (*_GSSortUnstable)(id *buffer, NSRange range, id comparisonEntity, extern void (*_GSSortUnstable)(id *buffer, NSRange range, id comparisonEntity,
GSComparisonType cmprType, void *context); GSComparisonType cmprType, void *context) GS_ATTRIB_PRIVATE;
/** /**
* This is the internal prototype of an stable, non-concurrency safe sorting * This is the internal prototype of an stable, non-concurrency safe sorting
@ -54,7 +54,7 @@ extern void (*_GSSortUnstable)(id *buffer, NSRange range, id comparisonEntity,
* GNUstep. * GNUstep.
*/ */
extern void (*_GSSortStable)(id *buffer, NSRange range, id comparisonEntity, extern void (*_GSSortStable)(id *buffer, NSRange range, id comparisonEntity,
GSComparisonType cmprType, void *context); GSComparisonType cmprType, void *context) GS_ATTRIB_PRIVATE;
/** /**
* This is the internal prototype of an unstable, concurrency safe sorting * This is the internal prototype of an unstable, concurrency safe sorting
@ -63,7 +63,8 @@ extern void (*_GSSortStable)(id *buffer, NSRange range, id comparisonEntity,
* GNUstep. * GNUstep.
*/ */
extern void (*_GSSortUnstableConcurrent)(id *buffer, NSRange range, extern void (*_GSSortUnstableConcurrent)(id *buffer, NSRange range,
id comparisonEntity, GSComparisonType cmprType, void *context); id comparisonEntity, GSComparisonType cmprType, void *context)
GS_ATTRIB_PRIVATE;
/** /**
* This is the internal prototype of an stable, concurrency safe sorting * This is the internal prototype of an stable, concurrency safe sorting
@ -72,7 +73,8 @@ extern void (*_GSSortUnstableConcurrent)(id *buffer, NSRange range,
* GNUstep. * GNUstep.
*/ */
extern void (*_GSSortStableConcurrent)(id *buffer, NSRange range, extern void (*_GSSortStableConcurrent)(id *buffer, NSRange range,
id comparisonEntity, GSComparisonType cmprType, void *context); id comparisonEntity, GSComparisonType cmprType, void *context)
GS_ATTRIB_PRIVATE;
/** /**
* GSSortUnstable() uses the above prototypes to provide sorting that does not * GSSortUnstable() uses the above prototypes to provide sorting that does not

View file

@ -32,7 +32,7 @@
#import "Foundation/NSString.h" #import "Foundation/NSString.h"
#import "Foundation/NSDistributedNotificationCenter.h" #import "Foundation/NSDistributedNotificationCenter.h"
NSString *objectObserver = @"org.GNUstep.NSHTTPCookieStorage"; static NSString *objectObserver = @"org.GNUstep.NSHTTPCookieStorage";
// Internal data storage // Internal data storage
typedef struct { typedef struct {

View file

@ -608,12 +608,12 @@ NSDecrementExtraRefCountWasZero(id anObject)
return release_fast_no_destroy(anObject); return release_fast_no_destroy(anObject);
} }
size_t object_getRetainCount_np_internal(id anObject) static size_t object_getRetainCount_np_internal(id anObject)
{ {
return ((obj)anObject)[-1].retained + 1; return ((obj)anObject)[-1].retained + 1;
} }
size_t getRetainCount(id anObject) static size_t getRetainCount(id anObject)
{ {
#ifdef __GNUSTEP_RUNTIME__ #ifdef __GNUSTEP_RUNTIME__
if (object_getRetainCount_np) if (object_getRetainCount_np)

View file

@ -52,14 +52,17 @@ typedef struct _cifframe_t {
@class NSMutableData; @class NSMutableData;
extern GSCodeBuffer* cifframe_closure(NSMethodSignature *sig, void (*func)()); extern GSCodeBuffer* cifframe_closure(NSMethodSignature *sig,
void (*func)()) GS_ATTRIB_PRIVATE;
extern void cifframe_set_arg(cifframe_t *cframe, int index, void *buffer, extern void cifframe_set_arg(cifframe_t *cframe, int index, void *buffer,
int size); int size) GS_ATTRIB_PRIVATE;
extern void cifframe_get_arg(cifframe_t *cframe, int index, void *buffer, extern void cifframe_get_arg(cifframe_t *cframe, int index, void *buffer,
int size); int size) GS_ATTRIB_PRIVATE;
extern void *cifframe_arg_addr(cifframe_t *cframe, int index); extern void *cifframe_arg_addr(cifframe_t *cframe, int index) GS_ATTRIB_PRIVATE;
extern BOOL cifframe_decode_arg(const char *type, void* buffer); extern BOOL cifframe_decode_arg(const char *type,
extern BOOL cifframe_encode_arg(const char *type, void* buffer); void *buffer) GS_ATTRIB_PRIVATE;
extern BOOL cifframe_encode_arg(const char *type,
void *buffer) GS_ATTRIB_PRIVATE;
#endif #endif

View file

@ -97,7 +97,7 @@ cifframe_type(const char *typePtr, const char **adv, NSPointerArray **extra);
/* Best guess at the space needed for a structure, since we don't know /* Best guess at the space needed for a structure, since we don't know
for sure until it's calculated in ffi_prep_cif, which is too late */ for sure until it's calculated in ffi_prep_cif, which is too late */
int static int
cifframe_guess_struct_size(ffi_type *stype) cifframe_guess_struct_size(ffi_type *stype)
{ {
int i, size; int i, size;