[OGo-GNUstep-Port] skyrix-sope fixes
Filip Van Raemdonck
gnustep-port@opengroupware.org
Fri, 25 Jul 2003 13:50:32 +0200
--eJnRUKwClWJh1Khz
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Hello,
Attached is a patch which fixes assorted compilation problems in skyrix-sope
using gnustep-base. It's similar to the skyrix-xml and skyrix-core patches I
sent last week, specifically:
- #if GNUSTEP_BASE_LIBRARY changes
- typecasts
- extra included files
- small interface/implementation definition fixes
- whatever I forgot to mention
Please comment / apply.
Regards,
Filip
--
Hardware, n.:
The parts of a computer system that can be kicked.
--eJnRUKwClWJh1Khz
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=diff-skyrix-sope-misc
diff -ru skyrix-sope-old/NGJavaScript/NGJavaScriptArray.m skyrix-sope-new/NGJavaScript/NGJavaScriptArray.m
--- skyrix-sope-old/NGJavaScript/NGJavaScriptArray.m 2003-07-17 18:41:38.000000000 +0200
+++ skyrix-sope-new/NGJavaScript/NGJavaScriptArray.m 2003-07-25 13:10:54.000000000 +0200
@@ -37,7 +37,7 @@
static BOOL isInitialized = NO;
if (!isInitialized) {
isInitialized = YES;
-#if NeXT_RUNTIME || APPLE_RUNTIME
+#if NeXT_RUNTIME || APPLE_RUNTIME || GNUSTEP_BASE_LIBRARY
# warning not supported on Apple yet (still required ?)...
#else
class_add_behavior(self, [NSMutableArray class]);
diff -ru skyrix-sope-old/NGJavaScript/common.h skyrix-sope-new/NGJavaScript/common.h
--- skyrix-sope-old/NGJavaScript/common.h 2003-07-17 18:41:39.000000000 +0200
+++ skyrix-sope-new/NGJavaScript/common.h 2003-07-25 13:10:54.000000000 +0200
@@ -29,17 +29,19 @@
#undef id
#import <Foundation/Foundation.h>
-#import <EOControl/EOControl.h>
+#include <EOControl/EOControl.h>
#if NeXT_Foundation_LIBRARY || APPLE_Foundation_LIBRARY
# include <FoundationExt/NSObjectMacros.h>
# include <FoundationExt/objc-runtime.h>
# include <FoundationExt/MissingMethods.h>
#else
+# ifndef GNUSTEP_BASE_LIBRARY
# include <extensions/objc-runtime.h>
+# endif
#endif
// TODO: this is true for any gcc 3 ?
-#if COCOA_Foundation_LIBRARY || NeXT_Foundation_LIBRARY
+#if COCOA_Foundation_LIBRARY || NeXT_Foundation_LIBRARY || GNUSTEP_BASE_LIBRARY
# define NG_VARARGS_AS_REFERENCE 1
#endif
diff -ru skyrix-sope-old/NGObjDOM/Dynamic.subproj/ODR_bind_form.m skyrix-sope-new/NGObjDOM/Dynamic.subproj/ODR_bind_form.m
--- skyrix-sope-old/NGObjDOM/Dynamic.subproj/ODR_bind_form.m 2003-07-17 18:41:40.000000000 +0200
+++ skyrix-sope-new/NGObjDOM/Dynamic.subproj/ODR_bind_form.m 2003-07-25 13:10:54.000000000 +0200
@@ -21,6 +21,7 @@
// $Id: ODR_bind_form.m,v 1.2 2003/07/11 17:12:51 jan Exp $
#include <NGObjDOM/ODNodeRenderer.h>
+#include <EOControl/EOKeyValueCoding.h>
/*
attributes:
@@ -54,7 +55,7 @@
#include <NGObjDOM/ODNodeRendererFactory.h>
#include <NGObjDOM/ODNamespaces.h>
#include <DOM/EDOM.h>
-#import <NGObjWeb/NGObjWeb.h>
+#include <NGObjWeb/NGObjWeb.h>
@interface _ODRBindFormTemplateWrapper : WODynamicElement
@end
diff -ru skyrix-sope-old/NGObjDOM/Dynamic.subproj/ODR_bind_groupings.m skyrix-sope-new/NGObjDOM/Dynamic.subproj/ODR_bind_groupings.m
--- skyrix-sope-old/NGObjDOM/Dynamic.subproj/ODR_bind_groupings.m 2003-07-17 18:41:40.000000000 +0200
+++ skyrix-sope-new/NGObjDOM/Dynamic.subproj/ODR_bind_groupings.m 2003-07-25 13:10:54.000000000 +0200
@@ -22,11 +22,11 @@
#include "ODR_bind_groupings.h"
-#import <EOControl/EOControl.h>
+#include <EOControl/EOControl.h>
#include <NGObjDOM/ODNamespaces.h>
#include <DOM/EDOM.h>
#include "common.h"
-
+#include "NGJavaScript/Core+JS.subproj/EOJavaScriptGrouping.h"
@implementation ODR_bind_groupings
- (void)appendNode:(id)_node
diff -ru skyrix-sope-old/NGObjDOM/GNUmakefile.preamble skyrix-sope-new/NGObjDOM/GNUmakefile.preamble
--- skyrix-sope-old/NGObjDOM/GNUmakefile.preamble 2003-07-10 00:57:26.000000000 +0200
+++ skyrix-sope-new/NGObjDOM/GNUmakefile.preamble 2003-07-25 13:10:54.000000000 +0200
@@ -11,5 +11,7 @@
-lNGExtensions \
ifneq ($(FOUNDATION_LIB),fd)
+ifneq ($(FOUNDATION_LIB),gnu)
libNGObjDOM_LIBRARIES_DEPEND_UPON += -lFoundationExt
endif
+endif
diff -ru skyrix-sope-old/NGObjDOM/ODNodeRenderer+attributes.m skyrix-sope-new/NGObjDOM/ODNodeRenderer+attributes.m
--- skyrix-sope-old/NGObjDOM/ODNodeRenderer+attributes.m 2003-07-17 18:41:39.000000000 +0200
+++ skyrix-sope-new/NGObjDOM/ODNodeRenderer+attributes.m 2003-07-25 13:10:54.000000000 +0200
@@ -354,8 +354,8 @@
languages:[[_ctx session] languages]
request:[_ctx request]];
}
-
- if ([[_attrNode name] hasPrefix:@"on"])
+
+ if ([(NSString *)[_attrNode name] hasPrefix:@"on"])
return [[_ctx elementID] stringValue];
}
return [[self valueForAttributeNode:_attrNode inContext:_ctx] stringValue];
diff -ru skyrix-sope-old/NGObjDOM/ODNodeRenderer.m skyrix-sope-new/NGObjDOM/ODNodeRenderer.m
--- skyrix-sope-old/NGObjDOM/ODNodeRenderer.m 2003-07-17 18:41:39.000000000 +0200
+++ skyrix-sope-new/NGObjDOM/ODNodeRenderer.m 2003-07-25 13:25:33.000000000 +0200
@@ -471,8 +471,8 @@
[uid appendString:@"."];
/* determine index of _node */
-
- children = [parent childNodes];
+
+ children = (NSArray *)[parent childNodes];
for (i = 0, count = [children count]; i < count; i++) {
if ([children objectAtIndex:i] == node)
break;
diff -ru skyrix-sope-old/NGObjDOM/XHTML.subproj/ODRDynamicXHTMLTag.m skyrix-sope-new/NGObjDOM/XHTML.subproj/ODRDynamicXHTMLTag.m
--- skyrix-sope-old/NGObjDOM/XHTML.subproj/ODRDynamicXHTMLTag.m 2003-07-17 18:41:40.000000000 +0200
+++ skyrix-sope-new/NGObjDOM/XHTML.subproj/ODRDynamicXHTMLTag.m 2003-07-25 13:10:54.000000000 +0200
@@ -22,6 +22,7 @@
#include "ODRDynamicXHTMLTag.h"
#include "common.h"
+#include <EOControl/EOKeyValueCoding.h>
#include <NGScripting/NSObject+Scripting.h>
#include <NGObjDOM/ODNamespaces.h>
diff -ru skyrix-sope-old/NGObjWeb/Associations/WOKeyPathAssociation.m skyrix-sope-new/NGObjWeb/Associations/WOKeyPathAssociation.m
--- skyrix-sope-old/NGObjWeb/Associations/WOKeyPathAssociation.m 2003-07-17 18:41:42.000000000 +0200
+++ skyrix-sope-new/NGObjWeb/Associations/WOKeyPathAssociation.m 2003-07-25 13:10:54.000000000 +0200
@@ -28,7 +28,9 @@
#if NeXT_Foundation_LIBRARY || APPLE_Foundation_LIBRARY
# include <FoundationExt/GarbageCollector.h>
#else
+# ifndef GNUSTEP_BASE_LIBRARY
# include <extensions/GarbageCollector.h>
+# endif
#endif
#if NeXT_RUNTIME
diff -ru skyrix-sope-old/NGObjWeb/DynamicElements/WOHyperlink.m skyrix-sope-new/NGObjWeb/DynamicElements/WOHyperlink.m
--- skyrix-sope-old/NGObjWeb/DynamicElements/WOHyperlink.m 2003-07-17 18:41:43.000000000 +0200
+++ skyrix-sope-new/NGObjWeb/DynamicElements/WOHyperlink.m 2003-07-25 13:10:54.000000000 +0200
@@ -27,6 +27,7 @@
#include <NGObjWeb/WOApplication.h>
#include <NGObjWeb/WOResourceManager.h>
#include "common.h"
+#include <NGExtensions/NSString+Ext.h>
#define PROFILE_CLUSTERS 0
diff -ru skyrix-sope-old/NGObjWeb/NGHttp/common.h skyrix-sope-new/NGObjWeb/NGHttp/common.h
--- skyrix-sope-old/NGObjWeb/NGHttp/common.h 2003-07-17 18:41:44.000000000 +0200
+++ skyrix-sope-new/NGObjWeb/NGHttp/common.h 2003-07-25 13:10:54.000000000 +0200
@@ -43,11 +43,13 @@
# import <FoundationExt/NSException.h>
# import <FoundationExt/GeneralExceptions.h>
#else
-# import <extensions/NSException.h>
-# if NeXT_FOUNDATION_LIBRARY || NeXT_Foundation_LIBRARY
-# import <extensions/GeneralExceptions.h>
-# else
-# import <extensions/exceptions/GeneralExceptions.h>
+# ifndef GNUSTEP_BASE_LIBRARY
+# import <extensions/NSException.h>
+# if NeXT_FOUNDATION_LIBRARY || NeXT_Foundation_LIBRARY
+# import <extensions/GeneralExceptions.h>
+# else
+# import <extensions/exceptions/GeneralExceptions.h>
+# endif
# endif
#endif
diff -ru skyrix-sope-old/NGObjWeb/NGHttp+WO.m skyrix-sope-new/NGObjWeb/NGHttp+WO.m
--- skyrix-sope-old/NGObjWeb/NGHttp+WO.m 2003-07-17 18:41:41.000000000 +0200
+++ skyrix-sope-new/NGObjWeb/NGHttp+WO.m 2003-07-25 13:25:55.000000000 +0200
@@ -333,8 +333,8 @@
[[DispClass alloc] initWithString:[disposition stringValue]];
[disposition autorelease];
}
-
- name = [disposition name];
+
+ name = [(NGMimeContentDispositionHeaderField *)disposition name];
partBody = [bodyPart body];
if (partBody) {
diff -ru skyrix-sope-old/NGObjWeb/OWViewRequestHandler.m skyrix-sope-new/NGObjWeb/OWViewRequestHandler.m
--- skyrix-sope-old/NGObjWeb/OWViewRequestHandler.m 2003-07-17 18:41:41.000000000 +0200
+++ skyrix-sope-new/NGObjWeb/OWViewRequestHandler.m 2003-07-25 13:26:22.000000000 +0200
@@ -107,11 +107,11 @@
/* no request page (probably the first request) */
result = [app pageWithName:nil inContext:_ctx];
[(id)result _awakeWithContext:_ctx];
- [_ctx setPage:result];
+ [_ctx setPage:(WOComponent *)result];
}
}
-
- response = [self generateResponseForComponent:result
+
+ response = [self generateResponseForComponent:(WOComponent *)result
inContext:_ctx
application:app];
diff -ru skyrix-sope-old/NGObjWeb/SNSConnection.m skyrix-sope-new/NGObjWeb/SNSConnection.m
--- skyrix-sope-old/NGObjWeb/SNSConnection.m 2003-07-17 18:41:41.000000000 +0200
+++ skyrix-sope-new/NGObjWeb/SNSConnection.m 2003-07-25 13:10:54.000000000 +0200
@@ -26,6 +26,10 @@
#include <NGObjWeb/WOSession.h>
#include "common.h"
+#ifdef GNUSTEP_BASE_LIBRARY
+#include <NGExtensions/NSRunLoop+FileObjects.h>
+#endif
+
// TODO: NEED TO FIX FOR Exception-less IO !!! (safeWrite...)
typedef enum {
diff -ru skyrix-sope-old/NGObjWeb/SoOFS/OFSHttpPasswd.m skyrix-sope-new/NGObjWeb/SoOFS/OFSHttpPasswd.m
--- skyrix-sope-old/NGObjWeb/SoOFS/OFSHttpPasswd.m 2003-07-17 18:41:45.000000000 +0200
+++ skyrix-sope-new/NGObjWeb/SoOFS/OFSHttpPasswd.m 2003-07-25 13:10:54.000000000 +0200
@@ -155,7 +155,7 @@
}
- (NSString *)authRealm {
- return [[WOApplication application] name];
+ return [(WOApplication *)[WOApplication application] name];
}
- (BOOL)isRootLogin:(NSString *)_login {
diff -ru skyrix-sope-old/NGObjWeb/SoOFS/common.h skyrix-sope-new/NGObjWeb/SoOFS/common.h
--- skyrix-sope-old/NGObjWeb/SoOFS/common.h 2003-07-17 18:41:45.000000000 +0200
+++ skyrix-sope-new/NGObjWeb/SoOFS/common.h 2003-07-25 13:10:54.000000000 +0200
@@ -23,11 +23,13 @@
#if LIB_FOUNDATION_LIBRARY
# import <Foundation/exceptions/GeneralExceptions.h>
#else
+#ifndef GNUSTEP_BASE_LIBRARY
# import <FoundationExt/NSObjectMacros.h>
# import <FoundationExt/NSString+Ext.h>
# import <FoundationExt/GeneralExceptions.h>
# import <FoundationExt/MissingMethods.h>
#endif
+#endif
#import <Foundation/Foundation.h>
#include <NGExtensions/NGExtensions.h>
diff -ru skyrix-sope-old/NGObjWeb/SoObjects/SoObjCClass.m skyrix-sope-new/NGObjWeb/SoObjects/SoObjCClass.m
--- skyrix-sope-old/NGObjWeb/SoObjects/SoObjCClass.m 2003-07-17 18:41:45.000000000 +0200
+++ skyrix-sope-new/NGObjWeb/SoObjects/SoObjCClass.m 2003-07-25 13:10:54.000000000 +0200
@@ -25,6 +25,8 @@
#include <NGExtensions/NGObjCRuntime.h>
#include "common.h"
+#include <NGExtensions/NSString+Ext.h>
+
@implementation SoObjCClass
- (id)initWithSoSuperClass:(SoClass *)_soClass class:(Class)_clazz {
diff -ru skyrix-sope-old/NGObjWeb/WOComponent.m skyrix-sope-new/NGObjWeb/WOComponent.m
--- skyrix-sope-old/NGObjWeb/WOComponent.m 2003-07-17 18:41:41.000000000 +0200
+++ skyrix-sope-new/NGObjWeb/WOComponent.m 2003-07-25 13:10:54.000000000 +0200
@@ -33,6 +33,7 @@
#include "common.h"
#include <NGExtensions/NGBundleManager.h>
#import <EOControl/EOControl.h>
+#include <NGExtensions/NSString+Ext.h>
@interface WOContext(ComponentStackCount)
- (unsigned)componentStackCount;
@@ -46,7 +47,6 @@
static BOOL debugOn = NO;
static BOOL debugComponentAwake = NO;
static BOOL debugTemplates = NO;
-static BOOL abortOnMissingCtx = NO;
static BOOL abortOnAwakeComponentInCtxDealloc = NO;
+ (int)version {
diff -ru skyrix-sope-old/NGObjWeb/WOContext.m skyrix-sope-new/NGObjWeb/WOContext.m
--- skyrix-sope-old/NGObjWeb/WOContext.m 2003-07-17 18:41:42.000000000 +0200
+++ skyrix-sope-new/NGObjWeb/WOContext.m 2003-07-25 13:10:54.000000000 +0200
@@ -291,7 +291,7 @@
}
- (id)cursor {
- return [[self component] cursor];
+ return [(id <WOPageGenerationContext>)[self component] cursor];
}
/* components */
diff -ru skyrix-sope-old/NGObjWeb/WOCoreApplication.m skyrix-sope-new/NGObjWeb/WOCoreApplication.m
--- skyrix-sope-old/NGObjWeb/WOCoreApplication.m 2003-07-17 18:41:42.000000000 +0200
+++ skyrix-sope-new/NGObjWeb/WOCoreApplication.m 2003-07-25 13:10:54.000000000 +0200
@@ -32,6 +32,8 @@
#if LIB_FOUNDATION_LIBRARY
# import <Foundation/UnixSignalHandler.h>
+#else
+# include "UnixSignalHandler.h"
#endif
NGObjWeb_DECLARE NSString *WOApplicationDidFinishLaunchingNotification =
diff -ru skyrix-sope-old/NGObjWeb/WOHttpAdaptor/WOHttpAdaptor.m skyrix-sope-new/NGObjWeb/WOHttpAdaptor/WOHttpAdaptor.m
--- skyrix-sope-old/NGObjWeb/WOHttpAdaptor/WOHttpAdaptor.m 2003-07-17 18:41:47.000000000 +0200
+++ skyrix-sope-new/NGObjWeb/WOHttpAdaptor/WOHttpAdaptor.m 2003-07-25 13:10:54.000000000 +0200
@@ -33,7 +33,11 @@
#if LIB_FOUNDATION_LIBRARY
# import <Foundation/UnixSignalHandler.h>
#else
+# if GNUSTEP_BASE_LIBRARY
+# include "UnixSignalHandler.h"
+# else
# import <FoundationExt/UnixSignalHandler.h>
+# endif
#endif
//#define USE_POOLS 1
diff -ru skyrix-sope-old/NGObjWeb/WOStatisticsStore.m skyrix-sope-new/NGObjWeb/WOStatisticsStore.m
--- skyrix-sope-old/NGObjWeb/WOStatisticsStore.m 2003-07-17 18:41:42.000000000 +0200
+++ skyrix-sope-new/NGObjWeb/WOStatisticsStore.m 2003-07-25 13:10:54.000000000 +0200
@@ -333,7 +333,7 @@
if ([page respondsToSelector:@selector(descriptionForResponse:inContext:)])
result = [page descriptionForResponse:_response inContext:_context];
else
- result = [page name];
+ result = [(WOComponent *)page name];
}
else {
return [NSString stringWithFormat:@"<no page generated for context %@>",
diff -ru skyrix-sope-old/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m skyrix-sope-new/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m
--- skyrix-sope-old/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m 2003-07-17 18:41:48.000000000 +0200
+++ skyrix-sope-new/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m 2003-07-25 13:10:54.000000000 +0200
@@ -38,6 +38,7 @@
#include <SaxObjC/SaxObjC.h>
#include <SaxObjC/XMLNamespaces.h>
#include "common.h"
+#include <NGExtensions/NSString+Ext.h>
@interface WORequest(HackURI)
- (void)_hackSetURI:(NSString *)_vuri;
diff -ru skyrix-sope-old/NGObjWeb/WebDAV/SoWebDAVRenderer.m skyrix-sope-new/NGObjWeb/WebDAV/SoWebDAVRenderer.m
--- skyrix-sope-old/NGObjWeb/WebDAV/SoWebDAVRenderer.m 2003-07-17 18:41:48.000000000 +0200
+++ skyrix-sope-new/NGObjWeb/WebDAV/SoWebDAVRenderer.m 2003-07-25 13:10:54.000000000 +0200
@@ -31,6 +31,7 @@
#include <NGObjWeb/WOElement.h>
#include <SaxObjC/XMLNamespaces.h>
#include "common.h"
+#include <NGExtensions/NSString+Ext.h>
/*
What HotMail uses for responses:
diff -ru skyrix-sope-old/NGObjWeb/common.h skyrix-sope-new/NGObjWeb/common.h
--- skyrix-sope-old/NGObjWeb/common.h 2003-07-17 18:41:42.000000000 +0200
+++ skyrix-sope-new/NGObjWeb/common.h 2003-07-25 13:10:54.000000000 +0200
@@ -35,7 +35,7 @@
#if LIB_FOUNDATION_LIBRARY
# import <Foundation/exceptions/GeneralExceptions.h>
#elif GNUSTEP_BASE_LIBRARY
-# import <extensions/exceptions/GeneralExceptions.h>
+//# import <extensions/exceptions/GeneralExceptions.h>
#else
# import <FoundationExt/NSObjectMacros.h>
# import <FoundationExt/NSString+Ext.h>
@@ -88,4 +88,9 @@
# define PROFILE_CHECKPOINT(__key__)
#endif
+@interface NSException (setUserInfo)
+- (id) setReason: (NSString*) _reason;
+- (id) setUserInfo: (NSDictionary*) _userInfo;
+@end
+
#endif /* __NGObjWeb_common_H__ */
diff -ru skyrix-sope-old/NGObjWeb/xmlrpc_call.m skyrix-sope-new/NGObjWeb/xmlrpc_call.m
--- skyrix-sope-old/NGObjWeb/xmlrpc_call.m 2003-07-17 18:41:42.000000000 +0200
+++ skyrix-sope-new/NGObjWeb/xmlrpc_call.m 2003-07-25 13:10:54.000000000 +0200
@@ -23,6 +23,12 @@
#include <NGXmlRpc/NGXmlRpcClient.h>
#include "common.h"
+#include <NGExtensions/NSString+Ext.h>
+
+#ifdef GNUSTEP_BASE_LIBRARY
+#include "UnixSignalHandler.h"
+#endif
+
@class WOResponse;
@interface NGXmlRpcClient(CallFailed)
diff -ru skyrix-sope-old/NGScripting/common.h skyrix-sope-new/NGScripting/common.h
--- skyrix-sope-old/NGScripting/common.h 2003-07-17 18:41:48.000000000 +0200
+++ skyrix-sope-new/NGScripting/common.h 2003-07-25 13:10:54.000000000 +0200
@@ -20,13 +20,20 @@
*/
// $Id: common.h,v 1.2 2003/07/11 17:12:51 jan Exp $
-#import <Foundation/Foundation.h>
-#import <EOControl/EOControl.h>
+#ifndef __NGScripting_common_H__
+#define __NGScripting_common_H__
+
+#include <Foundation/Foundation.h>
+#include <EOControl/EOControl.h>
#if !LIB_FOUNDATION_LIBRARY && !GNUSTEP_BASE_LIBRARY
# include <FoundationExt/NSObjectMacros.h>
# include <FoundationExt/objc-runtime.h>
# include <FoundationExt/MissingMethods.h>
#else
+# ifndef GNUSTEP_BASE_LIBRARY
# include <extensions/objc-runtime.h>
+# endif
+#endif
+
#endif
diff -ru skyrix-sope-old/SxComponents/SxComponentInvocation.m skyrix-sope-new/SxComponents/SxComponentInvocation.m
--- skyrix-sope-old/SxComponents/SxComponentInvocation.m 2003-07-17 18:41:48.000000000 +0200
+++ skyrix-sope-new/SxComponents/SxComponentInvocation.m 2003-07-25 13:10:54.000000000 +0200
@@ -25,6 +25,8 @@
#include "SxComponent.h"
#include "common.h"
+#include <NGExtensions/NSString+Ext.h>
+
@implementation SxComponentInvocation
static NSNull *null = nil;
diff -ru skyrix-sope-old/SxComponents/SxXmlRpcComponent.m skyrix-sope-new/SxComponents/SxXmlRpcComponent.m
--- skyrix-sope-old/SxComponents/SxXmlRpcComponent.m 2003-07-17 18:41:48.000000000 +0200
+++ skyrix-sope-new/SxComponents/SxXmlRpcComponent.m 2003-07-25 13:10:54.000000000 +0200
@@ -264,7 +264,7 @@
compRegistry = [self componentRegistry];
[compRegistry _removeComponentFromLookupCache:[self componentName]];
- tmpComp = [compRegistry getComponent:[self componentName]];
+ tmpComp = (SxXmlRpcComponent *)[compRegistry getComponent:[self componentName]];
if (tmpComp != nil) {
NSURL *tmpUrl;
diff -ru skyrix-sope-old/SxComponents/common.h skyrix-sope-new/SxComponents/common.h
--- skyrix-sope-old/SxComponents/common.h 2003-07-17 18:41:48.000000000 +0200
+++ skyrix-sope-new/SxComponents/common.h 2003-07-25 13:10:54.000000000 +0200
@@ -22,7 +22,7 @@
#import <Foundation/Foundation.h>
-#if !LIB_FOUNDATION_LIBRARY
+#if !LIB_FOUNDATION_LIBRARY && !GNUSTEP_BASE_LIBRARY
# include <FoundationExt/NSObjectMacros.h>
# include <FoundationExt/MissingMethods.h>
# include <FoundationExt/NGPropertyListParser.h>
diff -ru skyrix-sope-old/SxComponents/sxc_ls.m skyrix-sope-new/SxComponents/sxc_ls.m
--- skyrix-sope-old/SxComponents/sxc_ls.m 2003-07-17 18:41:48.000000000 +0200
+++ skyrix-sope-new/SxComponents/sxc_ls.m 2003-07-25 13:10:54.000000000 +0200
@@ -24,6 +24,7 @@
#include <SxComponents/SxComponentRegistry.h>
@interface SxcLsTool : NSObject
+- (int) runWithArguments: (NSArray*) _args;
@end
@implementation SxcLsTool
diff -ru skyrix-sope-old/WEExtensions/WEWeekColumnView.m skyrix-sope-new/WEExtensions/WEWeekColumnView.m
--- skyrix-sope-old/WEExtensions/WEWeekColumnView.m 2003-07-17 18:41:49.000000000 +0200
+++ skyrix-sope-new/WEExtensions/WEWeekColumnView.m 2003-07-25 13:10:54.000000000 +0200
@@ -20,9 +20,12 @@
*/
// $Id: #
-#import "WEContextConditional.h"
+#include "WEContextConditional.h"
#include <NGObjWeb/NGObjWeb.h>
+/* Needed for ceil()/floor() */
+#include <js/jslibmath.h>
+
/*
draws this:
@@ -82,7 +85,7 @@
}
@end
-#import "common.h"
+#include "common.h"
@implementation WEWeekColumnView
diff -ru skyrix-sope-old/WEExtensions/WEWeekOverview.m skyrix-sope-new/WEExtensions/WEWeekOverview.m
--- skyrix-sope-old/WEExtensions/WEWeekOverview.m 2003-07-17 18:41:49.000000000 +0200
+++ skyrix-sope-new/WEExtensions/WEWeekOverview.m 2003-07-25 13:10:54.000000000 +0200
@@ -20,9 +20,12 @@
*/
// $Id: WEWeekOverview.m,v 1.2 2003/07/11 17:12:51 jan Exp $
-#import "WEContextConditional.h"
+#include "WEContextConditional.h"
#include <NGObjWeb/NGObjWeb.h>
+/* Needed for ceil()/floor() */
+#include <js/jslibmath.h>
+
/*
renders this:
@@ -118,7 +121,7 @@
}
@end
-#import "common.h"
+#include "common.h"
@implementation WEWeekOverview
--eJnRUKwClWJh1Khz--