diff --git a/ChangeLog b/ChangeLog index ca7118d..d75ebca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2000-10-30 Mirko Viviani + + * GSWExtensions.framework/GNUmakefile: rewrite using framework.make + * GSWExtensions.framework/*.(h|m): changed gsweb include dir from + gsweb/GSWeb.framework/ to GSWeb/ + + * GSWeb.framework/GNUmakefile: rewrite using framework.make + * GSWeb.framework/*.(h|m): changed gsweb include dir from + gsweb/GSWeb.framework/ to GSWeb/ + * GSWeb.framework/GSWConstants.m: removed the frameworkd suffix. + * GSWeb.framework/GSWUtils.m ([NSBundle +tmpAllFrameworks]): removed. + 2000-10-29 Mirko Viviani * GSWeb.framework/GSWElementIDString.h: use NSMutableString instead of diff --git a/GSWAdaptors/Apache/GNUmakefile b/GSWAdaptors/Apache/GNUmakefile index 66fca6b..3570635 100644 --- a/GSWAdaptors/Apache/GNUmakefile +++ b/GSWAdaptors/Apache/GNUmakefile @@ -42,7 +42,7 @@ else endif endif -APACHEHEADERS := -I/usr/apache/include -I/usr/include/apache -I/usr/local/include/apache -I/usr/lib/apache/include +APACHEHEADERS := -I/usr/apache/include -I/usr/include/apache -I/usr/local/include/apache -I/usr/lib/apache/include -I/usr/local/include APXS := $(APXS) -l PropList -L/usr/local/lib diff --git a/GSWExtensions.framework/GNUmakefile b/GSWExtensions.framework/GNUmakefile index 03b7fdd..c63b2d7 100644 --- a/GSWExtensions.framework/GNUmakefile +++ b/GSWExtensions.framework/GNUmakefile @@ -32,15 +32,14 @@ include ../config.mak srcdir = . -# The library to be compiled -GSWBUNDLE_NAME=GSWExtensions -GSWExtensions_HAS_GSWCOMPONENTS=YES +# The framework to be compiled +FRAMEWORK_NAME = GSWExtensions -# The bundle resource files and directories +# The framework resource files and directories GSWExtensions_RESOURCE_FILES = \ Resources/Info-gnustep.plist -GSWExtensions_COMPONENTS= \ +GSWExtensions_COMPONENTS = \ GSWSessionCreationErrorPage.gswc \ GSWSessionRestorationErrorPage.gswc \ GSWCollapsibleComponentContent.gswc \ @@ -66,7 +65,7 @@ GSWRedirect.gswc #GSWPageRestorationErrorPage.gswc #GSWToOneRelationship.gswc -GSWExtensions_LANGUAGES= \ +GSWExtensions_LANGUAGES = \ French GSWExtensions_RESOURCE_DIRS = @@ -92,23 +91,16 @@ gswapp.gif \ gswappsrv.gif -# The bundles libraries to link against -#GSWExtensions_BUNDLE_LIBS = - -# The bundles to be installed -GSWBUNDLE_INSTALL = $(BUNDLE_NAME) -GSWBUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARIES_ROOT)/gsweb - # Determine the bundle directory extension -ifeq ($(profile), yes) - GSWBUNDLE_EXTENSION = .frameworkp -else - ifeq ($(debug), yes) - GSWBUNDLE_EXTENSION = .frameworkd - else - GSWBUNDLE_EXTENSION = .framework - endif -endif +#ifeq ($(profile), yes) +# GSWBUNDLE_EXTENSION = .frameworkp +#else +# ifeq ($(debug), yes) +# GSWBUNDLE_EXTENSION = .frameworkd +# else +# GSWBUNDLE_EXTENSION = .framework +# endif +#endif # The Objective-C source files to be compiled GSWExtensions_OBJC_FILES = \ @@ -124,16 +116,8 @@ GSWMetaRefresh.m #GSWCompletionBar.m -# The library to be compiled -LIBRARY_NAME=libGSWExtensions - -# The bundle Objective-C source files to be compiled -libGSWExtensions_OBJC_FILES = $(GSWExtensions_OBJC_FILES) - -libGSWExtensions_HEADER_FILES_DIR = . -libGSWExtensions_HEADER_FILES_INSTALL_DIR = /gsweb/GSWExtensions.framework - -libGSWExtensions_HEADER_FILES = \ +# The header files to be installed +GSWExtensions_HEADER_FILES = \ GSWCollapsibleComponentContent.h \ GSWDictionaryRepetition.h \ GSWExceptionPage.h \ @@ -164,8 +148,7 @@ HDRS = $(LIBRARY_NAME:=.h) -include GNUmakefile.local -include $(GNUSTEP_MAKEFILES)/gswbundle.make -include $(GNUSTEP_MAKEFILES)/library.make +include $(GNUSTEP_MAKEFILES)/framework.make -include Makefile.postamble diff --git a/GSWExtensions.framework/GSWCollapsibleComponentContent.m b/GSWExtensions.framework/GSWCollapsibleComponentContent.m index 2a82ada..e54d74e 100644 --- a/GSWExtensions.framework/GSWCollapsibleComponentContent.m +++ b/GSWExtensions.framework/GSWCollapsibleComponentContent.m @@ -20,7 +20,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include #include "GSWCollapsibleComponentContent.h" //=================================================================================== diff --git a/GSWExtensions.framework/GSWDictionaryRepetition.m b/GSWExtensions.framework/GSWDictionaryRepetition.m index 9c27c62..9fba248 100644 --- a/GSWExtensions.framework/GSWDictionaryRepetition.m +++ b/GSWExtensions.framework/GSWDictionaryRepetition.m @@ -20,7 +20,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include #include "GSWDictionaryRepetition.h" //==================================================================== diff --git a/GSWExtensions.framework/GSWExceptionPage.m b/GSWExtensions.framework/GSWExceptionPage.m index 9c5c90e..a2d7bcd 100644 --- a/GSWExtensions.framework/GSWExceptionPage.m +++ b/GSWExtensions.framework/GSWExceptionPage.m @@ -20,7 +20,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include #include "GSWExceptionPage.h" //=================================================================================== diff --git a/GSWExtensions.framework/GSWIFrame.m b/GSWExtensions.framework/GSWIFrame.m index cbf73d2..70270ec 100644 --- a/GSWExtensions.framework/GSWIFrame.m +++ b/GSWExtensions.framework/GSWIFrame.m @@ -20,7 +20,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include #include "GSWIFrame.h" //=================================================================================== diff --git a/GSWExtensions.framework/GSWMetaRefresh.m b/GSWExtensions.framework/GSWMetaRefresh.m index fa71411..7c6aebc 100644 --- a/GSWExtensions.framework/GSWMetaRefresh.m +++ b/GSWExtensions.framework/GSWMetaRefresh.m @@ -20,7 +20,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include #include "GSWMetaRefresh.h" //=================================================================================== diff --git a/GSWExtensions.framework/GSWPageRestorationErrorPage.m b/GSWExtensions.framework/GSWPageRestorationErrorPage.m index cd533ae..81c51b1 100644 --- a/GSWExtensions.framework/GSWPageRestorationErrorPage.m +++ b/GSWExtensions.framework/GSWPageRestorationErrorPage.m @@ -20,7 +20,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include #include "GSWPageRestorationErrorPage.h" //=================================================================================== diff --git a/GSWExtensions.framework/GSWRedirect.m b/GSWExtensions.framework/GSWRedirect.m index ce7e516..9ddfdcc 100644 --- a/GSWExtensions.framework/GSWRedirect.m +++ b/GSWExtensions.framework/GSWRedirect.m @@ -21,7 +21,7 @@ Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include #include "GSWRedirect.h" //=================================================================================== diff --git a/GSWExtensions.framework/GSWSessionCreationErrorPage.m b/GSWExtensions.framework/GSWSessionCreationErrorPage.m index b3098a9..54ab21f 100644 --- a/GSWExtensions.framework/GSWSessionCreationErrorPage.m +++ b/GSWExtensions.framework/GSWSessionCreationErrorPage.m @@ -20,7 +20,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include #include "GSWSessionCreationErrorPage.h" //=================================================================================== diff --git a/GSWExtensions.framework/GSWSessionRestorationErrorPage.m b/GSWExtensions.framework/GSWSessionRestorationErrorPage.m index b232d12..caf4ef1 100644 --- a/GSWExtensions.framework/GSWSessionRestorationErrorPage.m +++ b/GSWExtensions.framework/GSWSessionRestorationErrorPage.m @@ -20,7 +20,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include #include "GSWSessionRestorationErrorPage.h" //==================================================================== diff --git a/GSWExtensions.framework/GSWStatsPage.m b/GSWExtensions.framework/GSWStatsPage.m index 1aaeb7a..d2c38df 100644 --- a/GSWExtensions.framework/GSWStatsPage.m +++ b/GSWExtensions.framework/GSWStatsPage.m @@ -20,7 +20,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include #include "GSWStatsPage.h" //=================================================================================== diff --git a/GSWExtensionsGSW.framework/GNUmakefile b/GSWExtensionsGSW.framework/GNUmakefile index 63cdbdd..48b9edc 100644 --- a/GSWExtensionsGSW.framework/GNUmakefile +++ b/GSWExtensionsGSW.framework/GNUmakefile @@ -32,11 +32,10 @@ include ../config.mak srcdir = . -# The library to be compiled -GSWBUNDLE_NAME=GSWExtensionsGSW -GSWExtensionsGSW_HAS_GSWCOMPONENTS=YES +# The framework to be compiled +FRAMEWORK_NAME = GSWExtensionsGSW -# The bundle resource files and directories +# The framework resource files and directories GSWExtensionsGSW_RESOURCE_FILES = \ Resources/Info-gnustep.plist \ @@ -54,23 +53,16 @@ GSWExtensionsGSW_RESOURCE_DIRS = GSWExtensionsGSW_WEBSERVER_RESOURCE_FILES = -# The bundles libraries to link against -#GNUstepWeb_BUNDLE_LIBS = - -# The bundles to be installed -GSWBUNDLE_INSTALL = $(BUNDLE_NAME) -GSWBUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARIES_ROOT)/gsweb - # Determine the bundle directory extension -ifeq ($(profile), yes) - GSWBUNDLE_EXTENSION = .frameworkp -else - ifeq ($(debug), yes) - GSWBUNDLE_EXTENSION = .frameworkd - else - GSWBUNDLE_EXTENSION = .framework - endif -endif +#ifeq ($(profile), yes) +# GSWBUNDLE_EXTENSION = .frameworkp +#else +# ifeq ($(debug), yes) +# GSWBUNDLE_EXTENSION = .frameworkd +# else +# GSWBUNDLE_EXTENSION = .framework +# endif +#endif # The Objective-C source files to be compiled GSWExtensionsGSW_OBJC_FILES = \ @@ -80,16 +72,8 @@ GSWValidationFailureComponent.m \ GSWSimpleFormComponent.m \ GSWFileUploadFormComponent.m -# The library to be compiled -LIBRARY_NAME=libGSWExtensionsGSW - -# The bundle Objective-C source files to be compiled -libGSWExtensionsGSW_OBJC_FILES = $(GSWExtensionsGSW_OBJC_FILES) - -libGSWExtensionsGSW_HEADER_FILES_DIR = . -libGSWExtensionsGSW_HEADER_FILES_INSTALL_DIR = /gsweb/GSWExtensionsGSW.framework - -libGSWExtensionsGSW_HEADER_FILES = \ +# The header files to be installed +GSWExtensionsGSW_HEADER_FILES = \ GSWLogin.h \ GSWTabComponent.h \ GSWValidationFailureComponent.h \ @@ -105,7 +89,6 @@ HDRS = $(LIBRARY_NAME:=.h) -include GNUmakefile.local -include $(GNUSTEP_MAKEFILES)/gswbundle.make -include $(GNUSTEP_MAKEFILES)/library.make +include $(GNUSTEP_MAKEFILES)/framework.make -include Makefile.postamble diff --git a/GSWExtensionsGSW.framework/GSWFileUploadFormComponent.m b/GSWExtensionsGSW.framework/GSWFileUploadFormComponent.m index f0b6759..1220f18 100644 --- a/GSWExtensionsGSW.framework/GSWFileUploadFormComponent.m +++ b/GSWExtensionsGSW.framework/GSWFileUploadFormComponent.m @@ -20,7 +20,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include #include "GSWFileUploadFormComponent.h" //==================================================================== @implementation GSWFileUploadFormComponent diff --git a/GSWExtensionsGSW.framework/GSWLogin.m b/GSWExtensionsGSW.framework/GSWLogin.m index 0ba046e..3420350 100644 --- a/GSWExtensionsGSW.framework/GSWLogin.m +++ b/GSWExtensionsGSW.framework/GSWLogin.m @@ -20,7 +20,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include #include "GSWLogin.h" //==================================================================== @implementation GSWLogin diff --git a/GSWExtensionsGSW.framework/GSWSimpleFormComponent.m b/GSWExtensionsGSW.framework/GSWSimpleFormComponent.m index c1e857b..30099e7 100644 --- a/GSWExtensionsGSW.framework/GSWSimpleFormComponent.m +++ b/GSWExtensionsGSW.framework/GSWSimpleFormComponent.m @@ -20,7 +20,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include #include "GSWSimpleFormComponent.h" //==================================================================== @implementation GSWSimpleFormComponent diff --git a/GSWExtensionsGSW.framework/GSWTabComponent.m b/GSWExtensionsGSW.framework/GSWTabComponent.m index 210b3b8..f4a8a26 100644 --- a/GSWExtensionsGSW.framework/GSWTabComponent.m +++ b/GSWExtensionsGSW.framework/GSWTabComponent.m @@ -20,7 +20,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include #include "GSWTabComponent.h" //==================================================================== @implementation GSWTabComponent diff --git a/GSWExtensionsGSW.framework/GSWValidationFailureComponent.m b/GSWExtensionsGSW.framework/GSWValidationFailureComponent.m index 41f1cba..2821340 100644 --- a/GSWExtensionsGSW.framework/GSWValidationFailureComponent.m +++ b/GSWExtensionsGSW.framework/GSWValidationFailureComponent.m @@ -20,7 +20,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include #include "GSWValidationFailureComponent.h" //==================================================================== @implementation GSWValidationFailureComponent diff --git a/GSWeb.framework/GNUmakefile b/GSWeb.framework/GNUmakefile index 7fb25bc..864ae71 100644 --- a/GSWeb.framework/GNUmakefile +++ b/GSWeb.framework/GNUmakefile @@ -32,8 +32,8 @@ include ../config.mak srcdir = . -# The Bundle to be compiled -GSWBUNDLE_NAME=GSWeb +# The framework to be compiled +FRAMEWORK_NAME = GSWeb # DTDs to install srcDTDDir = DTDs @@ -47,30 +47,27 @@ xhtml1-frameset.dtd \ xhtml1-transitional.dtd -# The bundle resource files and directories +# The framework resource files and directories GSWeb_RESOURCE_FILES = \ Resources/MIME.plist \ -Resources/languages.plist +Resources/languages.plist \ +DTDs -GSWeb_RESOURCE_DIRS = +GSWeb_RESOURCE_DIRS = DTDs -# The bundles libraries to link against +# The framework libraries to link against GSWeb_GSWBUNDLE_LIBS = -# The bundles to be installed -GSWBUNDLE_INSTALL = $(BUNDLE_NAME) -GSWBUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARIES_ROOT)/gsweb - # Determine the bundle directory extension -ifeq ($(profile), yes) - GSWBUNDLE_EXTENSION = .frameworkp -else - ifeq ($(debug), yes) - GSWBUNDLE_EXTENSION = .frameworkd - else - GSWBUNDLE_EXTENSION = .framework - endif -endif +#ifeq ($(profile), yes) +# GSWBUNDLE_EXTENSION = .frameworkp +#else +# ifeq ($(debug), yes) +# GSWBUNDLE_EXTENSION = .frameworkd +# else +# GSWBUNDLE_EXTENSION = .framework +# endif +#endif # The Bundle Objective-C source files to be compiled GSWeb_OBJC_FILES = \ @@ -185,16 +182,8 @@ stacktrace.m \ attach.m -# The library to be compiled -LIBRARY_NAME=libGSWeb - -# The bundle Objective-C source files to be compiled -libGSWeb_OBJC_FILES = $(GSWeb_OBJC_FILES) - -libGSWeb_HEADER_FILES_DIR = . -libGSWeb_HEADER_FILES_INSTALL_DIR = /gsweb/GSWeb.framework - -libGSWeb_HEADER_FILES = \ +# The framework installed header files +GSWeb_HEADER_FILES = \ GSCache.h \ GSWActiveImage.h \ GSWAdaptor.h \ @@ -312,13 +301,10 @@ SRCS = $(LIBRARY_NAME:=.m) HDRS = $(LIBRARY_NAME:=.h) -#DIST_FILES = $(SRCS) $(HDRS) GNUmakefile Makefile.postamble Makefile.preamble - -include Makefile.preamble -include GNUmakefile.local -include $(GNUSTEP_MAKEFILES)/gswbundle.make -include $(GNUSTEP_MAKEFILES)/library.make +include $(GNUSTEP_MAKEFILES)/framework.make -include Makefile.postamble diff --git a/GSWeb.framework/GSCache.m b/GSWeb.framework/GSCache.m index 12b350b..5518a29 100644 --- a/GSWeb.framework/GSCache.m +++ b/GSWeb.framework/GSCache.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include #include "GSCache.h" //======================================================================================== diff --git a/GSWeb.framework/GSWActionURL.m b/GSWeb.framework/GSWActionURL.m index 5e7cc1e..c27e3a7 100644 --- a/GSWeb.framework/GSWActionURL.m +++ b/GSWeb.framework/GSWActionURL.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWActionURL diff --git a/GSWeb.framework/GSWActiveImage.m b/GSWeb.framework/GSWActiveImage.m index e3b789d..7f5fe2c 100644 --- a/GSWeb.framework/GSWActiveImage.m +++ b/GSWeb.framework/GSWActiveImage.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWActiveImage diff --git a/GSWeb.framework/GSWAdaptor.m b/GSWeb.framework/GSWAdaptor.m index 737e545..2187007 100644 --- a/GSWeb.framework/GSWAdaptor.m +++ b/GSWeb.framework/GSWAdaptor.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== diff --git a/GSWeb.framework/GSWApplet.m b/GSWeb.framework/GSWApplet.m index bea2129..3ea375d 100644 --- a/GSWeb.framework/GSWApplet.m +++ b/GSWeb.framework/GSWApplet.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWApplet diff --git a/GSWeb.framework/GSWApplication.m b/GSWeb.framework/GSWApplication.m index 2a0c6d0..07f3a7c 100644 --- a/GSWeb.framework/GSWApplication.m +++ b/GSWeb.framework/GSWApplication.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include #include #include #if GDL2 // GDL2 implementation diff --git a/GSWeb.framework/GSWAssociation.m b/GSWeb.framework/GSWAssociation.m index 3f9dc9a..44f3384 100644 --- a/GSWeb.framework/GSWAssociation.m +++ b/GSWeb.framework/GSWAssociation.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include #include static NSDictionary* localMinMaxDictionary=nil; diff --git a/GSWeb.framework/GSWBindingNameAssociation.m b/GSWeb.framework/GSWBindingNameAssociation.m index cdd6df5..8cd700c 100644 --- a/GSWeb.framework/GSWBindingNameAssociation.m +++ b/GSWeb.framework/GSWBindingNameAssociation.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWBindingNameAssociation diff --git a/GSWeb.framework/GSWBody.m b/GSWeb.framework/GSWBody.m index 9a5601e..24da809 100644 --- a/GSWeb.framework/GSWBody.m +++ b/GSWeb.framework/GSWBody.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWBody diff --git a/GSWeb.framework/GSWBrowser.m b/GSWeb.framework/GSWBrowser.m index 0f2ece8..96ebdae 100644 --- a/GSWeb.framework/GSWBrowser.m +++ b/GSWeb.framework/GSWBrowser.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWBrowser diff --git a/GSWeb.framework/GSWBundle.m b/GSWeb.framework/GSWBundle.m index 980bfed..aebfa17 100644 --- a/GSWeb.framework/GSWBundle.m +++ b/GSWeb.framework/GSWBundle.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== diff --git a/GSWeb.framework/GSWCheckBox.m b/GSWeb.framework/GSWCheckBox.m index 1bf80ed..4835fcc 100644 --- a/GSWeb.framework/GSWCheckBox.m +++ b/GSWeb.framework/GSWCheckBox.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWCheckBox diff --git a/GSWeb.framework/GSWCheckBoxList.m b/GSWeb.framework/GSWCheckBoxList.m index c3c3455..1cf763a 100644 --- a/GSWeb.framework/GSWCheckBoxList.m +++ b/GSWeb.framework/GSWCheckBoxList.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWCheckBoxList diff --git a/GSWeb.framework/GSWClientSideScript.m b/GSWeb.framework/GSWClientSideScript.m index 74e90ad..fa08141 100644 --- a/GSWeb.framework/GSWClientSideScript.m +++ b/GSWeb.framework/GSWClientSideScript.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWClientSideScript diff --git a/GSWeb.framework/GSWComponent.m b/GSWeb.framework/GSWComponent.m index 23251a5..2029edc 100644 --- a/GSWeb.framework/GSWComponent.m +++ b/GSWeb.framework/GSWComponent.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWComponent diff --git a/GSWeb.framework/GSWComponentContent.m b/GSWeb.framework/GSWComponentContent.m index 5ae0003..bc78fea 100644 --- a/GSWeb.framework/GSWComponentContent.m +++ b/GSWeb.framework/GSWComponentContent.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWComponentContent diff --git a/GSWeb.framework/GSWComponentDefinition.m b/GSWeb.framework/GSWComponentDefinition.m index 4ae5b9a..32647ee 100644 --- a/GSWeb.framework/GSWComponentDefinition.m +++ b/GSWeb.framework/GSWComponentDefinition.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWComponentDefinition diff --git a/GSWeb.framework/GSWComponentReference.m b/GSWeb.framework/GSWComponentReference.m index d765e4a..2021f83 100644 --- a/GSWeb.framework/GSWComponentReference.m +++ b/GSWeb.framework/GSWComponentReference.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWComponentReference diff --git a/GSWeb.framework/GSWComponentRequestHandler.m b/GSWeb.framework/GSWComponentRequestHandler.m index 0e51a34..8a311cd 100644 --- a/GSWeb.framework/GSWComponentRequestHandler.m +++ b/GSWeb.framework/GSWComponentRequestHandler.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWComponentRequestHandler diff --git a/GSWeb.framework/GSWConditional.m b/GSWeb.framework/GSWConditional.m index 5bbc9b6..d5e78d8 100644 --- a/GSWeb.framework/GSWConditional.m +++ b/GSWeb.framework/GSWConditional.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWConditional diff --git a/GSWeb.framework/GSWConstantValueAssociation.m b/GSWeb.framework/GSWConstantValueAssociation.m index c5192fc..62789b3 100644 --- a/GSWeb.framework/GSWConstantValueAssociation.m +++ b/GSWeb.framework/GSWConstantValueAssociation.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWConstantValueAssociation diff --git a/GSWeb.framework/GSWConstants.m b/GSWeb.framework/GSWConstants.m index 6d9552f..1654ead 100644 --- a/GSWeb.framework/GSWConstants.m +++ b/GSWeb.framework/GSWConstants.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== // - @@ -75,13 +75,8 @@ NSString* GSWMonitorServiceName=@"gsweb-monitor"; NSString* GSWLibraryPSuffix=@".gswso"; #endif -#ifdef DEBUG -NSString* GSFrameworkSuffix=@"frameworkd"; -NSString* GSFrameworkPSuffix=@".frameworkd"; -#else NSString* GSFrameworkSuffix=@"framework"; NSString* GSFrameworkPSuffix=@".framework"; -#endif NSString* GSLanguageSuffix=@"lproj"; NSString* GSLanguagePSuffix=@".lproj"; NSString* GSWComponentTemplateSuffix=@"html"; diff --git a/GSWeb.framework/GSWContext.m b/GSWeb.framework/GSWContext.m index 5acefdc..1a20fca 100644 --- a/GSWeb.framework/GSWContext.m +++ b/GSWeb.framework/GSWContext.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include static int dontTraceComponentActionURL=0; //==================================================================== diff --git a/GSWeb.framework/GSWCookie.m b/GSWeb.framework/GSWCookie.m index c1c89c5..0cd9e90 100644 --- a/GSWeb.framework/GSWCookie.m +++ b/GSWeb.framework/GSWCookie.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWCookie diff --git a/GSWeb.framework/GSWDebug.m b/GSWeb.framework/GSWDebug.m index 25d3004..29bb054 100644 --- a/GSWeb.framework/GSWDebug.m +++ b/GSWeb.framework/GSWDebug.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include #include #include #include diff --git a/GSWeb.framework/GSWDefaultAdaptor.m b/GSWeb.framework/GSWDefaultAdaptor.m index 1608eb4..5c68a13 100644 --- a/GSWeb.framework/GSWDefaultAdaptor.m +++ b/GSWeb.framework/GSWDefaultAdaptor.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWDefaultAdaptor diff --git a/GSWeb.framework/GSWDefaultAdaptorThread.m b/GSWeb.framework/GSWDefaultAdaptorThread.m index c6dfcba..59b0c42 100644 --- a/GSWeb.framework/GSWDefaultAdaptorThread.m +++ b/GSWeb.framework/GSWDefaultAdaptorThread.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include #include #include "NSNonBlockingFileHandle.h" //==================================================================== diff --git a/GSWeb.framework/GSWDeployedBundle.m b/GSWeb.framework/GSWDeployedBundle.m index bfcb83d..250355a 100644 --- a/GSWeb.framework/GSWDeployedBundle.m +++ b/GSWeb.framework/GSWDeployedBundle.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include #include //==================================================================== diff --git a/GSWeb.framework/GSWDirectAction.m b/GSWeb.framework/GSWDirectAction.m index 05d8f6d..770058c 100644 --- a/GSWeb.framework/GSWDirectAction.m +++ b/GSWeb.framework/GSWDirectAction.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWDirectAction diff --git a/GSWeb.framework/GSWDirectActionRequestHandler.m b/GSWeb.framework/GSWDirectActionRequestHandler.m index d572f5f..7004b9a 100644 --- a/GSWeb.framework/GSWDirectActionRequestHandler.m +++ b/GSWeb.framework/GSWDirectActionRequestHandler.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWDirectActionRequestHandler diff --git a/GSWeb.framework/GSWDisplayGroup.h b/GSWeb.framework/GSWDisplayGroup.h index d680d23..29f57db 100644 --- a/GSWeb.framework/GSWDisplayGroup.h +++ b/GSWeb.framework/GSWDisplayGroup.h @@ -24,7 +24,7 @@ // $Id$ #ifndef _GSWDisplayGroup_h__ - #define _GSWDisplayGroup_h__ +#define _GSWDisplayGroup_h__ #if !GDL2 #include @@ -48,11 +48,14 @@ #include #include +@class EOKeyValueUnarchiver; + #define EODataSource EODatabaseDataSource #else #import #import #import +#import #import #endif @@ -140,10 +143,10 @@ - (unsigned)indexOfFirstDisplayedObject; - (unsigned)indexOfLastDisplayedObject; - (id)init; --(void)awakeFromKeyValueUnarchiver:(EOKeyValueUnarchiver*)object_; +- (void)awakeFromKeyValueUnarchiver:(EOKeyValueUnarchiver*)object_; - (NSMutableDictionary *)inputObjectForQualifier; - (BOOL)inQueryMode; --(void)editingContext:(id)editingContext_ +- (void)editingContext:(id)editingContext_ presentErrorMessage:(id)msg; - (id)insert; - (NSDictionary *)insertedObjectDefaultValues; diff --git a/GSWeb.framework/GSWDisplayGroup.m b/GSWeb.framework/GSWDisplayGroup.m index d37f252..c74af2f 100644 --- a/GSWeb.framework/GSWDisplayGroup.m +++ b/GSWeb.framework/GSWDisplayGroup.m @@ -24,7 +24,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== diff --git a/GSWeb.framework/GSWDynamicElement.m b/GSWeb.framework/GSWDynamicElement.m index f03e02f..0c7549c 100644 --- a/GSWeb.framework/GSWDynamicElement.m +++ b/GSWeb.framework/GSWDynamicElement.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== diff --git a/GSWeb.framework/GSWDynamicURLString.m b/GSWeb.framework/GSWDynamicURLString.m index 3287ea9..66b98a5 100644 --- a/GSWeb.framework/GSWDynamicURLString.m +++ b/GSWeb.framework/GSWDynamicURLString.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWDynamicURLString diff --git a/GSWeb.framework/GSWElement.m b/GSWeb.framework/GSWElement.m index 3c8afff..fc16a24 100644 --- a/GSWeb.framework/GSWElement.m +++ b/GSWeb.framework/GSWElement.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include BYTE ElementsMap_htmlBareString = (BYTE)0x53; BYTE ElementsMap_gswebElement = (BYTE)0x57; diff --git a/GSWeb.framework/GSWElementIDString.m b/GSWeb.framework/GSWElementIDString.m index f9e3ff0..d57f9e3 100644 --- a/GSWeb.framework/GSWElementIDString.m +++ b/GSWeb.framework/GSWElementIDString.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWElementIDString diff --git a/GSWeb.framework/GSWEmbeddedObject.m b/GSWeb.framework/GSWEmbeddedObject.m index f2815c0..09397e5 100644 --- a/GSWeb.framework/GSWEmbeddedObject.m +++ b/GSWeb.framework/GSWEmbeddedObject.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWEmbeddedObject diff --git a/GSWeb.framework/GSWFileUpload.m b/GSWeb.framework/GSWFileUpload.m index 658bf92..ad1e0ae 100644 --- a/GSWeb.framework/GSWFileUpload.m +++ b/GSWeb.framework/GSWFileUpload.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWFileUpload diff --git a/GSWeb.framework/GSWForm.m b/GSWeb.framework/GSWForm.m index 4e146d2..8e86760 100644 --- a/GSWeb.framework/GSWForm.m +++ b/GSWeb.framework/GSWForm.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWForm diff --git a/GSWeb.framework/GSWFrame.m b/GSWeb.framework/GSWFrame.m index 26fa910..75b6f07 100644 --- a/GSWeb.framework/GSWFrame.m +++ b/GSWeb.framework/GSWFrame.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWFrame diff --git a/GSWeb.framework/GSWGenericContainer.m b/GSWeb.framework/GSWGenericContainer.m index 1a1062b..755fc56 100644 --- a/GSWeb.framework/GSWGenericContainer.m +++ b/GSWeb.framework/GSWGenericContainer.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWGenericContainer diff --git a/GSWeb.framework/GSWGenericElement.m b/GSWeb.framework/GSWGenericElement.m index fedf6ee..646c392 100644 --- a/GSWeb.framework/GSWGenericElement.m +++ b/GSWeb.framework/GSWGenericElement.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWGenericElement diff --git a/GSWeb.framework/GSWGeometricRegion.m b/GSWeb.framework/GSWGeometricRegion.m index 9938c87..777d7cd 100644 --- a/GSWeb.framework/GSWGeometricRegion.m +++ b/GSWeb.framework/GSWGeometricRegion.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include #include diff --git a/GSWeb.framework/GSWHTMLAttrLexer.h b/GSWeb.framework/GSWHTMLAttrLexer.h index 40b81eb..b07ece6 100644 --- a/GSWeb.framework/GSWHTMLAttrLexer.h +++ b/GSWeb.framework/GSWHTMLAttrLexer.h @@ -11,7 +11,7 @@ */ -#include +#include #include "gsantlr/ANTLRCommon.h" diff --git a/GSWeb.framework/GSWHTMLAttrLexer.m b/GSWeb.framework/GSWHTMLAttrLexer.m index 8f53065..3546364 100644 --- a/GSWeb.framework/GSWHTMLAttrLexer.m +++ b/GSWeb.framework/GSWHTMLAttrLexer.m @@ -8,7 +8,7 @@ */ -#include +#include #include "gsantlr/ANTLRCommon.h" #include "gsantlr/ANTLRException.h" diff --git a/GSWeb.framework/GSWHTMLAttrParser.h b/GSWeb.framework/GSWHTMLAttrParser.h index 62aba8f..694a82d 100644 --- a/GSWeb.framework/GSWHTMLAttrParser.h +++ b/GSWeb.framework/GSWHTMLAttrParser.h @@ -11,7 +11,7 @@ */ -#include +#include #include "gsantlr/ANTLRCommon.h" #include "gsantlr/ANTLRTokenizer.h" diff --git a/GSWeb.framework/GSWHTMLAttrParser.m b/GSWeb.framework/GSWHTMLAttrParser.m index dac3515..713595e 100644 --- a/GSWeb.framework/GSWHTMLAttrParser.m +++ b/GSWeb.framework/GSWHTMLAttrParser.m @@ -8,7 +8,7 @@ */ -#include +#include #include "gsantlr/ANTLRCommon.h" #include "GSWHTMLAttrParser.h" diff --git a/GSWeb.framework/GSWHTMLAttrParserExt.m b/GSWeb.framework/GSWHTMLAttrParserExt.m index 69a251c..c9abce1 100644 --- a/GSWeb.framework/GSWHTMLAttrParserExt.m +++ b/GSWeb.framework/GSWHTMLAttrParserExt.m @@ -24,7 +24,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWHTMLAttrParser (GSWHTMLAttrParserExt) diff --git a/GSWeb.framework/GSWHTMLAttrTokenTypes.h b/GSWeb.framework/GSWHTMLAttrTokenTypes.h index fd6388f..30c83af 100644 --- a/GSWeb.framework/GSWHTMLAttrTokenTypes.h +++ b/GSWeb.framework/GSWHTMLAttrTokenTypes.h @@ -11,7 +11,7 @@ */ -#include +#include enum GSWHTMLAttrTokenTypes { GSWHTMLAttrTokenType_EOF_ = 1, diff --git a/GSWeb.framework/GSWHTMLBareString.m b/GSWeb.framework/GSWHTMLBareString.m index 0dbca42..194100e 100644 --- a/GSWeb.framework/GSWHTMLBareString.m +++ b/GSWeb.framework/GSWHTMLBareString.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWHTMLBareString diff --git a/GSWeb.framework/GSWHTMLComment.m b/GSWeb.framework/GSWHTMLComment.m index be604a4..ab4b578 100644 --- a/GSWeb.framework/GSWHTMLComment.m +++ b/GSWeb.framework/GSWHTMLComment.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWHTMLComment diff --git a/GSWeb.framework/GSWHTMLDynamicElement.m b/GSWeb.framework/GSWHTMLDynamicElement.m index 5429e38..2e481d0 100644 --- a/GSWeb.framework/GSWHTMLDynamicElement.m +++ b/GSWeb.framework/GSWHTMLDynamicElement.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWHTMLDynamicElement diff --git a/GSWeb.framework/GSWHTMLLexer.h b/GSWeb.framework/GSWHTMLLexer.h index 109323b..d2ae0f4 100644 --- a/GSWeb.framework/GSWHTMLLexer.h +++ b/GSWeb.framework/GSWHTMLLexer.h @@ -11,7 +11,7 @@ */ -#include +#include #include "gsantlr/ANTLRCommon.h" diff --git a/GSWeb.framework/GSWHTMLLexer.m b/GSWeb.framework/GSWHTMLLexer.m index b6c66d4..d45163b 100644 --- a/GSWeb.framework/GSWHTMLLexer.m +++ b/GSWeb.framework/GSWHTMLLexer.m @@ -8,7 +8,7 @@ */ -#include +#include #include "gsantlr/ANTLRCommon.h" #include "gsantlr/ANTLRException.h" diff --git a/GSWeb.framework/GSWHTMLParser.h b/GSWeb.framework/GSWHTMLParser.h index 8e8aeb1..8af4838 100644 --- a/GSWeb.framework/GSWHTMLParser.h +++ b/GSWeb.framework/GSWHTMLParser.h @@ -11,7 +11,7 @@ */ -#include +#include #include "gsantlr/ANTLRCommon.h" #include "gsantlr/ANTLRTokenizer.h" diff --git a/GSWeb.framework/GSWHTMLParser.m b/GSWeb.framework/GSWHTMLParser.m index c01a846..75656f6 100644 --- a/GSWeb.framework/GSWHTMLParser.m +++ b/GSWeb.framework/GSWHTMLParser.m @@ -8,7 +8,7 @@ */ -#include +#include #include "gsantlr/ANTLRCommon.h" #include "GSWHTMLParser.h" diff --git a/GSWeb.framework/GSWHTMLParserExt.m b/GSWeb.framework/GSWHTMLParserExt.m index 5dbe87f..3f559ef 100644 --- a/GSWeb.framework/GSWHTMLParserExt.m +++ b/GSWeb.framework/GSWHTMLParserExt.m @@ -24,7 +24,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWHTMLParser (GSWHTMLParserExt) diff --git a/GSWeb.framework/GSWHTMLStaticElement.m b/GSWeb.framework/GSWHTMLStaticElement.m index 5c97dc6..5896caf 100644 --- a/GSWeb.framework/GSWHTMLStaticElement.m +++ b/GSWeb.framework/GSWHTMLStaticElement.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWHTMLStaticElement diff --git a/GSWeb.framework/GSWHTMLStaticGroup.m b/GSWeb.framework/GSWHTMLStaticGroup.m index b5acd83..af5948a 100644 --- a/GSWeb.framework/GSWHTMLStaticGroup.m +++ b/GSWeb.framework/GSWHTMLStaticGroup.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWHTMLStaticGroup diff --git a/GSWeb.framework/GSWHTMLTokenTypes.h b/GSWeb.framework/GSWHTMLTokenTypes.h index bd0b1f7..0c5d1aa 100644 --- a/GSWeb.framework/GSWHTMLTokenTypes.h +++ b/GSWeb.framework/GSWHTMLTokenTypes.h @@ -11,7 +11,7 @@ */ -#include +#include enum GSWHTMLTokenTypes { GSWHTMLTokenType_EOF_ = 1, diff --git a/GSWeb.framework/GSWHTMLURLValuedElement.m b/GSWeb.framework/GSWHTMLURLValuedElement.m index 5d5691b..ff47156 100644 --- a/GSWeb.framework/GSWHTMLURLValuedElement.m +++ b/GSWeb.framework/GSWHTMLURLValuedElement.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWHTMLURLValuedElement diff --git a/GSWeb.framework/GSWHiddenField.m b/GSWeb.framework/GSWHiddenField.m index 2d4029a..273d91b 100644 --- a/GSWeb.framework/GSWHiddenField.m +++ b/GSWeb.framework/GSWHiddenField.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWHiddenField diff --git a/GSWeb.framework/GSWHyperlink.m b/GSWeb.framework/GSWHyperlink.m index 1d37e9c..ce52179 100644 --- a/GSWeb.framework/GSWHyperlink.m +++ b/GSWeb.framework/GSWHyperlink.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWHyperlink diff --git a/GSWeb.framework/GSWImage.m b/GSWeb.framework/GSWImage.m index 6df682a..1703be7 100644 --- a/GSWeb.framework/GSWImage.m +++ b/GSWeb.framework/GSWImage.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWImage diff --git a/GSWeb.framework/GSWImageButton.m b/GSWeb.framework/GSWImageButton.m index fe1c510..9f4bcc7 100644 --- a/GSWeb.framework/GSWImageButton.m +++ b/GSWeb.framework/GSWImageButton.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWImageButton diff --git a/GSWeb.framework/GSWInput.m b/GSWeb.framework/GSWInput.m index 52cda5c..1c1d125 100644 --- a/GSWeb.framework/GSWInput.m +++ b/GSWeb.framework/GSWInput.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWInput diff --git a/GSWeb.framework/GSWJavaScript.m b/GSWeb.framework/GSWJavaScript.m index 4c8eb5b..659883d 100644 --- a/GSWeb.framework/GSWJavaScript.m +++ b/GSWeb.framework/GSWJavaScript.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWJavaScript diff --git a/GSWeb.framework/GSWKeyValueAssociation.m b/GSWeb.framework/GSWKeyValueAssociation.m index 4185b10..b76b3e9 100644 --- a/GSWeb.framework/GSWKeyValueAssociation.m +++ b/GSWeb.framework/GSWKeyValueAssociation.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWKeyValueAssociation diff --git a/GSWeb.framework/GSWMailDelivery.m b/GSWeb.framework/GSWMailDelivery.m index f41b733..1406aa7 100644 --- a/GSWeb.framework/GSWMailDelivery.m +++ b/GSWeb.framework/GSWMailDelivery.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWMailDelivery diff --git a/GSWeb.framework/GSWMultiKeyDictionary.m b/GSWeb.framework/GSWMultiKeyDictionary.m index c02a67d..1d7bd03 100644 --- a/GSWeb.framework/GSWMultiKeyDictionary.m +++ b/GSWeb.framework/GSWMultiKeyDictionary.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include #define DEFAULT_DICTIONARY_CAPACITY 32 diff --git a/GSWeb.framework/GSWNestedList.m b/GSWeb.framework/GSWNestedList.m index 9e091d0..084878d 100644 --- a/GSWeb.framework/GSWNestedList.m +++ b/GSWeb.framework/GSWNestedList.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWNestedList diff --git a/GSWeb.framework/GSWPageDefElement.m b/GSWeb.framework/GSWPageDefElement.m index 583f007..fd39e25 100644 --- a/GSWeb.framework/GSWPageDefElement.m +++ b/GSWeb.framework/GSWPageDefElement.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== diff --git a/GSWeb.framework/GSWPageDefLexer.h b/GSWeb.framework/GSWPageDefLexer.h index 31a8e21..01fa73d 100644 --- a/GSWeb.framework/GSWPageDefLexer.h +++ b/GSWeb.framework/GSWPageDefLexer.h @@ -11,7 +11,7 @@ */ -#include +#include #include "gsantlr/ANTLRCommon.h" diff --git a/GSWeb.framework/GSWPageDefLexer.m b/GSWeb.framework/GSWPageDefLexer.m index 94da970..6a9800d 100644 --- a/GSWeb.framework/GSWPageDefLexer.m +++ b/GSWeb.framework/GSWPageDefLexer.m @@ -8,7 +8,7 @@ */ -#include +#include #include "gsantlr/ANTLRCommon.h" #include "gsantlr/ANTLRException.h" diff --git a/GSWeb.framework/GSWPageDefParser.h b/GSWeb.framework/GSWPageDefParser.h index cce420a..8304f5b 100644 --- a/GSWeb.framework/GSWPageDefParser.h +++ b/GSWeb.framework/GSWPageDefParser.h @@ -11,7 +11,7 @@ */ -#include +#include #include "gsantlr/ANTLRCommon.h" #include "gsantlr/ANTLRTokenizer.h" diff --git a/GSWeb.framework/GSWPageDefParser.m b/GSWeb.framework/GSWPageDefParser.m index 44ead31..c813f8b 100644 --- a/GSWeb.framework/GSWPageDefParser.m +++ b/GSWeb.framework/GSWPageDefParser.m @@ -8,7 +8,7 @@ */ -#include +#include #include "gsantlr/ANTLRCommon.h" #include "GSWPageDefParser.h" diff --git a/GSWeb.framework/GSWPageDefParserExt.m b/GSWeb.framework/GSWPageDefParserExt.m index fbdcd3e..dfcffff 100644 --- a/GSWeb.framework/GSWPageDefParserExt.m +++ b/GSWeb.framework/GSWPageDefParserExt.m @@ -24,7 +24,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWPageDefParser (GSWPageDefParserExt) diff --git a/GSWeb.framework/GSWPageDefTokenTypes.h b/GSWeb.framework/GSWPageDefTokenTypes.h index 1c9520c..5829396 100644 --- a/GSWeb.framework/GSWPageDefTokenTypes.h +++ b/GSWeb.framework/GSWPageDefTokenTypes.h @@ -11,7 +11,7 @@ */ -#include +#include enum GSWPageDefTokenTypes { GSWPageDefTokenType_EOF_ = 1, diff --git a/GSWeb.framework/GSWParam.m b/GSWeb.framework/GSWParam.m index b2df9d8..bdfcd28 100644 --- a/GSWeb.framework/GSWParam.m +++ b/GSWeb.framework/GSWParam.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWParam diff --git a/GSWeb.framework/GSWPasswordField.m b/GSWeb.framework/GSWPasswordField.m index 21bd8e3..51b2804 100644 --- a/GSWeb.framework/GSWPasswordField.m +++ b/GSWeb.framework/GSWPasswordField.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWPasswordField diff --git a/GSWeb.framework/GSWPopUpButton.m b/GSWeb.framework/GSWPopUpButton.m index 6d5d36c..c8dfb95 100644 --- a/GSWeb.framework/GSWPopUpButton.m +++ b/GSWeb.framework/GSWPopUpButton.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWPopUpButton diff --git a/GSWeb.framework/GSWProcFS.m b/GSWeb.framework/GSWProcFS.m index 757c2b1..9264c8a 100644 --- a/GSWeb.framework/GSWProcFS.m +++ b/GSWeb.framework/GSWProcFS.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include #include #include diff --git a/GSWeb.framework/GSWProjectBundle.m b/GSWeb.framework/GSWProjectBundle.m index c7efa3f..0adb3ca 100644 --- a/GSWeb.framework/GSWProjectBundle.m +++ b/GSWeb.framework/GSWProjectBundle.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include #include diff --git a/GSWeb.framework/GSWRadioButton.m b/GSWeb.framework/GSWRadioButton.m index 5800c7d..4e4054e 100644 --- a/GSWeb.framework/GSWRadioButton.m +++ b/GSWeb.framework/GSWRadioButton.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWRadioButton diff --git a/GSWeb.framework/GSWRadioButtonList.m b/GSWeb.framework/GSWRadioButtonList.m index fa05542..47540e5 100644 --- a/GSWeb.framework/GSWRadioButtonList.m +++ b/GSWeb.framework/GSWRadioButtonList.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWRadioButtonList diff --git a/GSWeb.framework/GSWRepetition.m b/GSWeb.framework/GSWRepetition.m index 5e6ddfc..4330e73 100644 --- a/GSWeb.framework/GSWRepetition.m +++ b/GSWeb.framework/GSWRepetition.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWRepetition diff --git a/GSWeb.framework/GSWRequest.m b/GSWeb.framework/GSWRequest.m index f6114a7..2249fcd 100644 --- a/GSWeb.framework/GSWRequest.m +++ b/GSWeb.framework/GSWRequest.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== diff --git a/GSWeb.framework/GSWRequestHandler.m b/GSWeb.framework/GSWRequestHandler.m index 4b314fe..eab1c1b 100644 --- a/GSWeb.framework/GSWRequestHandler.m +++ b/GSWeb.framework/GSWRequestHandler.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWRequestHandler diff --git a/GSWeb.framework/GSWResetButton.m b/GSWeb.framework/GSWResetButton.m index 88d0d15..f99a37c 100644 --- a/GSWeb.framework/GSWResetButton.m +++ b/GSWeb.framework/GSWResetButton.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWResetButton diff --git a/GSWeb.framework/GSWResourceManager.m b/GSWeb.framework/GSWResourceManager.m index c56ab61..81f7ae7 100644 --- a/GSWeb.framework/GSWResourceManager.m +++ b/GSWeb.framework/GSWResourceManager.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== diff --git a/GSWeb.framework/GSWResourceRequestHandler.m b/GSWeb.framework/GSWResourceRequestHandler.m index 72358fd..0b3e623 100644 --- a/GSWeb.framework/GSWResourceRequestHandler.m +++ b/GSWeb.framework/GSWResourceRequestHandler.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWResourceRequestHandler diff --git a/GSWeb.framework/GSWResourceURL.m b/GSWeb.framework/GSWResourceURL.m index 09f54e6..2845e97 100644 --- a/GSWeb.framework/GSWResourceURL.m +++ b/GSWeb.framework/GSWResourceURL.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWResourceURL diff --git a/GSWeb.framework/GSWResponse.m b/GSWeb.framework/GSWResponse.m index 7ef4bc7..397e837 100644 --- a/GSWeb.framework/GSWResponse.m +++ b/GSWeb.framework/GSWResponse.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== diff --git a/GSWeb.framework/GSWServerSessionStore.m b/GSWeb.framework/GSWServerSessionStore.m index 2dea559..a15a3c8 100644 --- a/GSWeb.framework/GSWServerSessionStore.m +++ b/GSWeb.framework/GSWServerSessionStore.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWServerSessionStore diff --git a/GSWeb.framework/GSWSession.m b/GSWeb.framework/GSWSession.m index 853496d..5edb878 100644 --- a/GSWeb.framework/GSWSession.m +++ b/GSWeb.framework/GSWSession.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include #include //==================================================================== diff --git a/GSWeb.framework/GSWSessionStore.m b/GSWeb.framework/GSWSessionStore.m index 5988573..54f2855 100644 --- a/GSWeb.framework/GSWSessionStore.m +++ b/GSWeb.framework/GSWSessionStore.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== diff --git a/GSWeb.framework/GSWSessionTimeOut.m b/GSWeb.framework/GSWSessionTimeOut.m index a15817b..d737b83 100644 --- a/GSWeb.framework/GSWSessionTimeOut.m +++ b/GSWeb.framework/GSWSessionTimeOut.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include #include "GSWSessionTimeOut.h" //==================================================================== diff --git a/GSWeb.framework/GSWSessionTimeOutManager.m b/GSWeb.framework/GSWSessionTimeOutManager.m index 69119d2..b4d8478 100644 --- a/GSWeb.framework/GSWSessionTimeOutManager.m +++ b/GSWeb.framework/GSWSessionTimeOutManager.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include #include "GSWSessionTimeOut.h" //==================================================================== diff --git a/GSWeb.framework/GSWStatisticsStore.m b/GSWeb.framework/GSWStatisticsStore.m index 6d1e578..8de570f 100644 --- a/GSWeb.framework/GSWStatisticsStore.m +++ b/GSWeb.framework/GSWStatisticsStore.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include #include diff --git a/GSWeb.framework/GSWStats.m b/GSWeb.framework/GSWStats.m index 0fd0bdf..d47e8e8 100644 --- a/GSWeb.framework/GSWStats.m +++ b/GSWeb.framework/GSWStats.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWStats diff --git a/GSWeb.framework/GSWString.m b/GSWeb.framework/GSWString.m index 77300c2..90d8b87 100644 --- a/GSWeb.framework/GSWString.m +++ b/GSWeb.framework/GSWString.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== diff --git a/GSWeb.framework/GSWSubmitButton.m b/GSWeb.framework/GSWSubmitButton.m index e25c574..81d174b 100644 --- a/GSWeb.framework/GSWSubmitButton.m +++ b/GSWeb.framework/GSWSubmitButton.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWSubmitButton diff --git a/GSWeb.framework/GSWSwitchComponent.m b/GSWeb.framework/GSWSwitchComponent.m index 893abc7..4bf6e2f 100644 --- a/GSWeb.framework/GSWSwitchComponent.m +++ b/GSWeb.framework/GSWSwitchComponent.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWSwitchComponent diff --git a/GSWeb.framework/GSWTemplateParser.m b/GSWeb.framework/GSWTemplateParser.m index b11c7ad..4bd06f2 100644 --- a/GSWeb.framework/GSWTemplateParser.m +++ b/GSWeb.framework/GSWTemplateParser.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include #include #include #include "GSWPageDefLexer.h" diff --git a/GSWeb.framework/GSWTemplateParserANTLR.m b/GSWeb.framework/GSWTemplateParserANTLR.m index 0e20304..a3bbe92 100644 --- a/GSWeb.framework/GSWTemplateParserANTLR.m +++ b/GSWeb.framework/GSWTemplateParserANTLR.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWTemplateParserANTLR diff --git a/GSWeb.framework/GSWTemplateParserXML.m b/GSWeb.framework/GSWTemplateParserXML.m index a27d442..bf2417b 100644 --- a/GSWeb.framework/GSWTemplateParserXML.m +++ b/GSWeb.framework/GSWTemplateParserXML.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include #include #include @@ -232,9 +232,10 @@ xmlParserInputPtr GSWTemplateParserSAXHandler_ExternalLoader(const char *systemI NSString* resourceName=systemIdEntity; if ([[resourceName pathExtension] isEqual:@"dtd"]) resourceName=[resourceName stringByDeletingPathExtension]; - fileName=[NSBundle pathForGNUstepResource:resourceName - ofType:@"dtd" - inDirectory:@"DTDs"]; + fileName = [[NSBundle bundleForClass: [self class]] + pathForResource:resourceName + ofType:@"dtd" + inDirectory:@"DTDs"]; NSLog(@"systemIdEntity: fileName=%@ for Resource:%@",fileName,resourceName); if (fileName) { @@ -291,9 +292,10 @@ xmlParserInputPtr GSWTemplateParserSAXHandler_ExternalLoader(const char *systemI { if ([[resourceName pathExtension] isEqual:@"dtd"]) resourceName=[resourceName stringByDeletingPathExtension]; - fileName=[NSBundle pathForGNUstepResource:resourceName - ofType:@"dtd" - inDirectory:@"DTDs"]; + fileName = [[NSBundle bundleForClass: [self class]] + pathForResource:resourceName + ofType:@"dtd" + inDirectory:@"DTDs"]; NSLog(@"systemIdEntity: fileName=%@ for Resource:%@",fileName,publicIdEntity); if (fileName) { @@ -319,9 +321,10 @@ xmlParserInputPtr GSWTemplateParserSAXHandler_ExternalLoader(const char *systemI { if ([[resourceName pathExtension] isEqual:@"ent"]) resourceName=[resourceName stringByDeletingPathExtension]; - fileName=[NSBundle pathForGNUstepResource:resourceName - ofType:@"ent" - inDirectory:@"DTDs"]; + fileName = [[NSBundle bundleForClass: [self class]] + pathForResource:resourceName + ofType:@"ent" + inDirectory:@"DTDs"]; NSLog(@"systemIdEntity: fileName=%@ for Resource:%@",fileName,publicIdEntity); if (fileName) { diff --git a/GSWeb.framework/GSWText.m b/GSWeb.framework/GSWText.m index cf4e703..a43c357 100644 --- a/GSWeb.framework/GSWText.m +++ b/GSWeb.framework/GSWText.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWText diff --git a/GSWeb.framework/GSWTextField.m b/GSWeb.framework/GSWTextField.m index b9738ee..b258e1e 100644 --- a/GSWeb.framework/GSWTextField.m +++ b/GSWeb.framework/GSWTextField.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWTextField diff --git a/GSWeb.framework/GSWToggle.m b/GSWeb.framework/GSWToggle.m index f575aaf..0f7dd27 100644 --- a/GSWeb.framework/GSWToggle.m +++ b/GSWeb.framework/GSWToggle.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWToggle diff --git a/GSWeb.framework/GSWTransactionRecord.m b/GSWeb.framework/GSWTransactionRecord.m index 5e7519d..abc9bdd 100644 --- a/GSWeb.framework/GSWTransactionRecord.m +++ b/GSWeb.framework/GSWTransactionRecord.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWTransactionRecord diff --git a/GSWeb.framework/GSWURLValuedElementData.m b/GSWeb.framework/GSWURLValuedElementData.m index 0245b24..70de4a0 100644 --- a/GSWeb.framework/GSWURLValuedElementData.m +++ b/GSWeb.framework/GSWURLValuedElementData.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWURLValuedElementData diff --git a/GSWeb.framework/GSWUtils.h b/GSWeb.framework/GSWUtils.h index 58b5c9f..b1b5890 100644 --- a/GSWeb.framework/GSWUtils.h +++ b/GSWeb.framework/GSWUtils.h @@ -54,8 +54,6 @@ typedef unsigned int UINT32; #define UINTs_DEFINED #endif -#define allFrameworks tmpAllFrameworks - BOOL ClassIsKindOfClass(Class classA,Class classB); void ExceptionRaiseFn(const char *func, @@ -283,7 +281,6 @@ extern NSData* HexStringToData(NSString* _string); //==================================================================== @interface NSBundle (NSBundleAllFrameworks) -+(NSArray*)tmpAllFrameworks; -(NSString*)bundleName; @end diff --git a/GSWeb.framework/GSWUtils.m b/GSWeb.framework/GSWUtils.m index 0309f80..6513a4a 100644 --- a/GSWeb.framework/GSWUtils.m +++ b/GSWeb.framework/GSWUtils.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include #include #include @@ -681,31 +681,6 @@ void ValidationExceptionRaiseFn0(const char *func, //==================================================================== @implementation NSBundle (NSBundleAllFrameworks) -//-------------------------------------------------------------------- -+(NSArray*)tmpAllFrameworks -{ - NSMutableArray* _allFrameworks=nil; - NSArray* _allBundles=nil; - int i=0; - NSString* _bundlePath=nil; - NSBundle* _bundle=nil; - LOGObjectFnStart(); - _allFrameworks=[NSMutableArray array]; - _allBundles=[[self class] allBundles]; - for(i=0;i<[_allBundles count];i++) - { - _bundle=[_allBundles objectAtIndex:i]; - _bundlePath=[_bundle bundlePath]; - NSDebugMLLog(@"low",@"_bundlePath=%@",_bundlePath); - _bundlePath=[_bundlePath stringGoodPath]; - NSDebugMLLog(@"low",@"_bundlePath=%@",_bundlePath); - if ([_bundlePath hasSuffix:GSFrameworkSuffix]) - [_allFrameworks addObject:_bundle]; - }; - LOGObjectFnStop(); - return _allFrameworks; -}; - //-------------------------------------------------------------------- -(NSString*)bundleName { diff --git a/GSWeb.framework/GSWVBScript.m b/GSWeb.framework/GSWVBScript.m index 95052c0..aeb129d 100644 --- a/GSWeb.framework/GSWVBScript.m +++ b/GSWeb.framework/GSWVBScript.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation GSWVBScript diff --git a/GSWeb.framework/GSWeb.h b/GSWeb.framework/GSWeb.h index bb70b54..a8190a2 100644 --- a/GSWeb.framework/GSWeb.h +++ b/GSWeb.framework/GSWeb.h @@ -64,7 +64,7 @@ #include "GSCache.h" -#include +#include #if GSWEB_WONAMES #define GSWAdaptor WOAdaptor @@ -172,106 +172,106 @@ @class GSWResourceURL; @class GSWProcFSProcInfo; -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #endif //_GSWeb_h__ diff --git a/GSWeb.framework/GSWeb.m b/GSWeb.framework/GSWeb.m index e272ad6..bdb1ba9 100644 --- a/GSWeb.framework/GSWeb.m +++ b/GSWeb.framework/GSWeb.m @@ -23,6 +23,6 @@ static char rcsId[] = "$Id$"; -#include +#include diff --git a/GSWeb.framework/NSNonBlockingFileHandle.m b/GSWeb.framework/NSNonBlockingFileHandle.m index e1c1439..b0a3730 100644 --- a/GSWeb.framework/NSNonBlockingFileHandle.m +++ b/GSWeb.framework/NSNonBlockingFileHandle.m @@ -43,7 +43,7 @@ #endif #include #include "NSNonBlockingFileHandle.h" -#include +#include #include "GSWUtils.h" @implementation NSFileHandle (CFRNonBlockingIO) diff --git a/GSWeb.framework/NSObject+IVarAccess+PerformSel.m b/GSWeb.framework/NSObject+IVarAccess+PerformSel.m index 09cb0a5..25c46f6 100644 --- a/GSWeb.framework/NSObject+IVarAccess+PerformSel.m +++ b/GSWeb.framework/NSObject+IVarAccess+PerformSel.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include NSMutableDictionary* objectIVarAccessCache_Set=nil; NSMutableDictionary* objectIVarAccessCache_Get=nil; diff --git a/GSWeb.framework/NSString+HTML.m b/GSWeb.framework/NSString+HTML.m index 7f1d592..8254b79 100644 --- a/GSWeb.framework/NSString+HTML.m +++ b/GSWeb.framework/NSString+HTML.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include static NSArray* normalChars=nil; static NSArray* htmlChars=nil; diff --git a/GSWeb.framework/NSString+Trimming.m b/GSWeb.framework/NSString+Trimming.m index 19024d4..422c0dd 100644 --- a/GSWeb.framework/NSString+Trimming.m +++ b/GSWeb.framework/NSString+Trimming.m @@ -23,7 +23,7 @@ static char rcsId[] = "$Id$"; -#include +#include //==================================================================== @implementation NSString (SBString)