diff --git a/Headers/gnustep/base/String.h b/Headers/gnustep/base/String.h index d25c6c3d9..87b2f8388 100644 --- a/Headers/gnustep/base/String.h +++ b/Headers/gnustep/base/String.h @@ -24,6 +24,11 @@ #ifndef __String_h_OBJECTS_INCLUDE #define __String_h_OBJECTS_INCLUDE +/* xxx These method names need to be fixed because we will get + type conflicts with GNUSTEP. + Perhaps I'll just get rid of the GNU String objects and just + transfer this functionality into NSSTring and friends. */ + #include #include #include @@ -39,6 +44,8 @@ typedef unsigned short Character; collection of characters. So, all the collection methods are available. Nice. */ +/* Think about changing these names to avoid conflicts with OpenStep? */ + @protocol String // INITIALIZING NEWLY ALLOCATED STRINGS. DON'T FORGET TO RELEASE THEM!; diff --git a/Source/objects/String.h b/Source/objects/String.h index d25c6c3d9..87b2f8388 100644 --- a/Source/objects/String.h +++ b/Source/objects/String.h @@ -24,6 +24,11 @@ #ifndef __String_h_OBJECTS_INCLUDE #define __String_h_OBJECTS_INCLUDE +/* xxx These method names need to be fixed because we will get + type conflicts with GNUSTEP. + Perhaps I'll just get rid of the GNU String objects and just + transfer this functionality into NSSTring and friends. */ + #include #include #include @@ -39,6 +44,8 @@ typedef unsigned short Character; collection of characters. So, all the collection methods are available. Nice. */ +/* Think about changing these names to avoid conflicts with OpenStep? */ + @protocol String // INITIALIZING NEWLY ALLOCATED STRINGS. DON'T FORGET TO RELEASE THEM!;