summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjonas <jonas@3ad0048d-3df7-0310-abae-a5850022a9f2>2021-02-13 07:52:41 +0000
committerjonas <jonas@3ad0048d-3df7-0310-abae-a5850022a9f2>2021-02-13 07:52:41 +0000
commit29bbe0caa4efd05d5732c90997edc9c56d4f1db2 (patch)
tree17a127e0d44cfb77e4cdfffe5beb04cd9f9b8103
parent8a82382890d373c78960a30a1cd4a12e6d4c7203 (diff)
downloadfpc-29bbe0caa4efd05d5732c90997edc9c56d4f1db2.tar.gz
--- Merging r48662 into '.':
U packages/cocoaint/src/foundation/NSProcessInfo.inc --- Recording mergeinfo for merge of r48662 into '.': U . git-svn-id: https://svn.freepascal.org/svn/fpc/branches/fixes_3_2@48663 3ad0048d-3df7-0310-abae-a5850022a9f2
-rw-r--r--packages/cocoaint/src/foundation/NSProcessInfo.inc3
1 files changed, 1 insertions, 2 deletions
diff --git a/packages/cocoaint/src/foundation/NSProcessInfo.inc b/packages/cocoaint/src/foundation/NSProcessInfo.inc
index 2bf1c70f65..602ce68c39 100644
--- a/packages/cocoaint/src/foundation/NSProcessInfo.inc
+++ b/packages/cocoaint/src/foundation/NSProcessInfo.inc
@@ -82,8 +82,7 @@ const
{$ifdef CLASSES}
type
- NSProcessInfo_NSObject = objcclass external (NSObject)
- public
+ NSProcessInfoActivity = objccategory external (NSProcessInfo)
function beginActivityWithOptions_reason (options: NSActivityOptions; reason: NSString): NSObjectProtocol; message 'beginActivityWithOptions:reason:'; { available in 10_9, 7_0 }
procedure endActivity (activity: NSObjectProtocol); message 'endActivity:'; { available in 10_9, 7_0 }
procedure performActivityWithOptions_reason_usingBlock (options: NSActivityOptions; reason: NSString; block: OpaqueCBlock); message 'performActivityWithOptions:reason:usingBlock:'; { available in 10_9, 7_0 }