gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 08:26:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert last change

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@27234 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2008-12-06 23:03:04 +00:00
parent 806114d969
commit b694892d87
2 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Headers/Additions/GNUstepBase/GSCategories.h
View file

@ -30,6 +30,8 @@
#define INCLUDED_GS_CATEGORIES_H
#include "GNUstepBase/GSVersionMacros.h"
#include <Foundation/Foundation.h>
/* The following ifndef prevents the categories declared in this file being
* seen in GNUstep code. This is necessary because those category
* declarations are also present in the header files for the corresponding
@ -40,7 +42,6 @@
#ifndef GNUSTEP
#include <string.h>
#include <Foundation/Foundation.h>
#ifdef NeXT_Foundation_LIBRARY
#include <CoreFoundation/CFString.h>
@ -332,15 +333,6 @@ typedef enum _NSGNUstepStringEncoding
- (void) gcFinalize;
@end
@interface NSTask (GSCategories)
/** Returns the launch path given the name of a tool.<br />
* Locates the tool by looking in the standard directories,
* and failing that in the PATH set in the environment.<br />
* Returns the path found, or nil if the tool could not be located.
*/
+ (NSString*) launchPathForTool: (NSString*)name;
@end
/* ------------------------------------------------------------------------
* Functions
*/
@ -376,6 +368,15 @@ GS_EXPORT NSString *GSDebugFunctionMsg(const char *func, const char *file,
#endif /* GNUSTEP */
@interface NSTask (GSCategories)
/** Returns the launch path given the name of a tool.<br />
* Locates the tool by looking in the standard directories,
* and failing that in the PATH set in the environment.<br />
* Returns the path found, or nil if the tool could not be located.
*/
+ (NSString*) launchPathForTool: (NSString*)name;
@end
#endif /* INCLUDED_GS_CATEGORIES_H */

5
Source/GSSocketStream.m
View file

@ -170,13 +170,8 @@ GSPrivateSockaddrLength(struct sockaddr *addr)
@end
#if defined(HAVE_GNUTLS)
/* For some systems we may need to avoid headers using the objc reserved
* word 'id'.
*/
#define id GSTLSID
#include <gnutls/gnutls.h>
#include <gcrypt.h>
#undef GSTLSID
/* Set up locking callbacks for gcrypt so that it will be thread-safe.
*/