From 97c3ff4572e50d67eb83524f6bd748a16204a8e1 Mon Sep 17 00:00:00 2001 From: ericwa Date: Thu, 9 Sep 2010 22:18:01 +0000 Subject: [PATCH] * Source/NSDistantObject.m: #ifdef to disable category on Object was forgotten around the interface git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@31280 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 5 +++++ Source/NSDistantObject.m | 2 ++ 2 files changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index 073fd7c1f..b5126b498 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-09-09 Eric Wasylishen + + * Source/NSDistantObject.m: #ifdef to disable category + on Object was forgotten around the interface + 2010-09-10 Riccardo Mottola * Source/unix/GSRunLoopCtxt.m: only access array if port responds to selector, or it is not initialized diff --git a/Source/NSDistantObject.m b/Source/NSDistantObject.m index 0be61812b..b48ba5fe7 100644 --- a/Source/NSDistantObject.m +++ b/Source/NSDistantObject.m @@ -67,9 +67,11 @@ static int debug_proxy = 0; static Class placeHolder = 0; static Class distantObjectClass = 0; +#ifndef __GNUSTEP_RUNTIME__ @interface Object (NSConformsToProtocolNamed) - (BOOL) _conformsToProtocolNamed: (const char*)aName; @end +#endif @interface NSObject (NSConformsToProtocolNamed) - (BOOL) _conformsToProtocolNamed: (const char*)aName; @end