From 8755ceb15b1285c960ee6b982a671b3d730c1c8f Mon Sep 17 00:00:00 2001 From: rfm Date: Tue, 13 Oct 2009 09:59:34 +0000 Subject: [PATCH] simplify for older compilers git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@28821 72102866-910b-0410-8b05-ffd578937521 --- Source/GSString.m | 5 ----- Source/GSeq.h | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/Source/GSString.m b/Source/GSString.m index 4619796df..7c9adf304 100644 --- a/Source/GSString.m +++ b/Source/GSString.m @@ -213,11 +213,6 @@ typedef struct { #define GSEQ_S GSEQ_CS #include "GSeq.h" -/* - * Include sequence handling code with instructions to generate search - * and compare functions for NSString objects. - */ -#define GSEQ_STRCOMP strCompNsNs #define GSEQ_STRRANGE strRangeNsNs #define GSEQ_O GSEQ_NS #define GSEQ_S GSEQ_NS diff --git a/Source/GSeq.h b/Source/GSeq.h index f660ff416..969a313ff 100644 --- a/Source/GSeq.h +++ b/Source/GSeq.h @@ -373,7 +373,7 @@ static inline void GSeq_uppercase(GSeq seq) * If a string comparison function is required, implement it. */ #ifdef GSEQ_STRCOMP -static inline NSComparisonResult +static NSComparisonResult GSEQ_STRCOMP(NSString *ss, NSString *os, unsigned mask, NSRange aRange) { GSEQ_ST s = (GSEQ_ST)ss; @@ -593,7 +593,7 @@ GSEQ_STRCOMP(NSString *ss, NSString *os, unsigned mask, NSRange aRange) * If a string search function is required, implement it. */ #ifdef GSEQ_STRRANGE -static inline NSRange +static NSRange GSEQ_STRRANGE(NSString *ss, NSString *os, unsigned mask, NSRange aRange) { GSEQ_ST s = (GSEQ_ST)ss;