gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 00:41:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

changes to support alternative header locations

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@34290 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2011-12-15 09:42:39 +00:00
parent 016c110ec8
commit 32fc733268
25 changed files with 19211 additions and 4285 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
ChangeLog
View file

@ -1,3 +1,32 @@
2011-12-15 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSProcessInfo.m:
* Source/NSSocketPort.m:
* Source/NSMessagePortNameServer.m:
* Source/NSDebug.m:
* Source/NSDistributedLock.m:
* Source/GSHTTPURLHandle.m:
* Source/NSMessagePort.m:
* Source/NSFileManager.m:
* Source/NSString.m:
* Source/NSObject.m:
* Source/NSThread.m:
* Source/NSData.m:
* Source/GSNetwork.h:
* Source/GSFormat.m:
* Source/GSFileHandle.m:
* Source/NSTask.m:
* SSL/GSSSLHandle.m:
* SSL/configure.ac:
* SSL/configure:
* SSL/config.h.in:
* configure.ac:
* configure:
* Headers/GNUstepBase/config.h.in:
* Tools/gdnc.m:
Support fcntl.h and signal.h not being in the 'sys' subdirectory
(for android and any other systems with that header layout).
2011-12-15 Richard Frith-Macdonald <rfm@gnu.org>
* Headers/Foundation/NSObject.h:

3
Headers/GNUstepBase/config.h.in
View file

@ -202,6 +202,9 @@
/* Define to 1 if you have the <execinfo.h> header file. */
#undef HAVE_EXECINFO_H
/* Define to 1 if you have the <fcntl.h> header file. */
#undef HAVE_FCNTL_H
/* Define to 1 if you have the <float.h> header file. */
#undef HAVE_FLOAT_H

20
SSL/GSSSLHandle.m
View file

@ -64,6 +64,16 @@
#import "GSNetwork.h"
#import "GSFileHandle.h"
#if defined(HAVE_SYS_SIGNAL_H)
# include <sys/signal.h>
#elif defined(HAVE_SIGNAL_H)
# include <signal.h>
#endif
#if defined(HAVE_SYS_FILE_H)
# include <sys/file.h>
#endif
#if defined(__MINGW__)
#include <winsock2.h>
#else
@ -73,12 +83,16 @@
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <signal.h>
#endif /* __MINGW__ */
#include <sys/file.h>
#include <sys/stat.h>
#include <sys/fcntl.h>
#if defined(HAVE_SYS_FCNTL_H)
# include <sys/fcntl.h>
#elif defined(HAVE_FCNTL_H)
# include <fcntl.h>
#endif
#include <sys/ioctl.h>
#ifdef __svr4__
#include <sys/filio.h>

6
SSL/config.h.in
View file

@ -1,5 +1,8 @@
/* config.h.in. Generated from configure.ac by autoheader. */
/* Define to 1 if you have the <fcntl.h> header file. */
#undef HAVE_FCNTL_H
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
@ -93,9 +96,6 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
/* Define to the home page for this package. */
#undef PACKAGE_URL
/* Define to the version of this package. */
#undef PACKAGE_VERSION

3285
SSL/configure vendored
View file

File diff suppressed because it is too large Load diff

21
SSL/configure.ac
View file

@ -103,7 +103,26 @@ case "$target_os" in
esac
AC_CHECK_HEADERS(libc.h limits.h malloc.h memory.h string.h signal.h sys/signal.h sys/param.h sys/wait.h sys/file.h sys/fcntl.h sys/ioctl.h sys/stropts.h unistd.h utime.h stdint.h sys/inttypes.h)
AC_CHECK_HEADERS(dnl
fcntl.h dnl
libc.h dnl
limits.h dnl
malloc.h dnl
memory.h dnl
signal.h dnl
stdint.h dnl
string.h dnl
sys/fcntl.h dnl
sys/file.h dnl
sys/inttypes.h dnl
sys/ioctl.h dnl
sys/param.h dnl
sys/signal.h dnl
sys/stropts.h dnl
sys/wait.h dnl
unistd.h dnl
utime.h dnl
)
#--------------------------------------------------------------------
# Simple way to add a bunch of paths to the flags

14
Source/GSFileHandle.m
View file

@ -51,9 +51,19 @@
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <sys/file.h>
#if defined(HAVE_SYS_FILE_H)
# include <sys/file.h>
#endif
#include <sys/stat.h>
#include <sys/fcntl.h>
#if defined(HAVE_SYS_FCNTL_H)
# include <sys/fcntl.h>
#elif defined(HAVE_FCNTL_H)
# include <fcntl.h>
#endif
#include <sys/ioctl.h>
#ifdef __svr4__
#include <sys/filio.h>

8
Source/GSFormat.m
View file

@ -84,7 +84,13 @@
#include <string.h> // for strstr()
#include <sys/stat.h>
#include <sys/types.h>
#include <fcntl.h>
#if defined(HAVE_SYS_FCNTL_H)
# include <sys/fcntl.h>
#elif defined(HAVE_FCNTL_H)
# include <fcntl.h>
#endif
#include <stdio.h>
#ifdef HAVE_WCHAR_H
#include <wchar.h>

14
Source/GSHTTPURLHandle.m
View file

@ -50,13 +50,19 @@
#import "GSPrivate.h"
#include <string.h>
#include <sys/file.h>
#ifdef HAVE_SYS_FCNTL_H
#include <sys/fcntl.h> // For O_WRONLY, etc
#ifdef HAVE_SYS_FILE_H
# include <sys/file.h>
#endif
#if defined(HAVE_SYS_FCNTL_H)
# include <sys/fcntl.h>
#elif defined(HAVE_FCNTL_H)
# include <fcntl.h>
#endif
#ifdef HAVE_SYS_SOCKET_H
#include <sys/socket.h> // For MSG_PEEK, etc
# include <sys/socket.h> // For MSG_PEEK, etc
#endif
/*

8
Source/GSNetwork.h
View file

@ -30,7 +30,13 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#if defined(HAVE_SYS_FCNTL_H)
# include <sys/fcntl.h>
#elif defined(HAVE_FCNTL_H)
# include <fcntl.h>
#endif
#if defined(__MINGW32__) || defined(__MINGW64__)

8
Source/NSData.m
View file

@ -89,7 +89,13 @@
#ifdef HAVE_MMAP
#include <sys/mman.h>
#include <fcntl.h>
#if defined(HAVE_SYS_FCNTL_H)
# include <sys/fcntl.h>
#elif defined(HAVE_FCNTL_H)
# include <fcntl.h>
#endif
#ifndef MAP_FAILED
#define MAP_FAILED ((void*)-1) /* Failure address. */
#endif

7
Source/NSDebug.m
View file

@ -856,7 +856,12 @@ __builtin_extract_return_address(__builtin_return_address(a + 1)) : 0); break;
* Of course this will fail horribly if an exception occurs in one of the
* few methods we use to manage the per-thread jump buffer.
*/
#include <signal.h>
#if defined(HAVE_SYS_SIGNAL_H)
# include <sys/signal.h>
#elif defined(HAVE_SIGNAL_H)
# include <signal.h>
#endif
#include <setjmp.h>
#if defined(__MINGW__)

8
Source/NSDistributedLock.m
View file

@ -34,7 +34,13 @@
#import "Foundation/NSValue.h"
#import "GSPrivate.h"
#include <fcntl.h>
#if defined(HAVE_SYS_FCNTL_H)
# include <sys/fcntl.h>
#elif defined(HAVE_FCNTL_H)
# include <fcntl.h>
#endif
static NSFileManager *mgr = nil;

11
Source/NSFileManager.m
View file

@ -136,8 +136,8 @@
# include <sys/statfs.h>
#endif
#ifdef HAVE_SYS_FILE_H
#include <sys/file.h>
#if defined(HAVE_SYS_FILE_H)
# include <sys/file.h>
#endif
#ifdef HAVE_SYS_MOUNT_H
@ -148,7 +148,12 @@
#include <sys/stat.h>
#endif
#include <fcntl.h>
#if defined(HAVE_SYS_FCNTL_H)
# include <sys/fcntl.h>
#elif defined(HAVE_FCNTL_H)
# include <fcntl.h>
#endif
#ifdef HAVE_PWD_H
#include <pwd.h> /* For struct passwd */
#endif

15
Source/NSMessagePort.m
View file

@ -56,13 +56,24 @@
#include <arpa/inet.h> /* for inet_ntoa() */
#include <string.h> /* for strchr() */
#include <ctype.h> /* for strchr() */
#include <fcntl.h>
#if defined(HAVE_SYS_FCNTL_H)
# include <sys/fcntl.h>
#elif defined(HAVE_FCNTL_H)
# include <fcntl.h>
#endif
#include <sys/time.h>
#include <sys/resource.h>
#include <netdb.h>
#include <sys/socket.h>
#include <sys/file.h>
#if defined(HAVE_SYS_FILE_H)
# include <sys/file.h>
#endif
#include <sys/stat.h>
/*
* Stuff for setting the sockets into non-blocking mode.
*/

16
Source/NSMessagePortNameServer.m
View file

@ -40,8 +40,20 @@
#import "GSPortPrivate.h"
#include <sys/stat.h>
#include <signal.h>
#include <fcntl.h>
#if defined(HAVE_SYS_SIGNAL_H)
# include <sys/signal.h>
#elif defined(HAVE_SIGNAL_H)
# include <signal.h>
#endif
#if defined(HAVE_SYS_FCNTL_H)
# include <sys/fcntl.h>
#elif defined(HAVE_FCNTL_H)
# include <fcntl.h>
#endif
#include <string.h>
#include <sys/un.h>

9
Source/NSObject.m
View file

@ -52,11 +52,10 @@
#include <locale.h>
#endif
#ifdef HAVE_SIGNAL_H
#include <signal.h>
#endif
#ifdef HAVE_SYS_SIGNAL_H
#include <sys/signal.h>
#if defined(HAVE_SYS_SIGNAL_H)
# include <sys/signal.h>
#elif defined(HAVE_SIGNAL_H)
# include <signal.h>
#endif
#if __GNUC__ >= 4

29
Source/NSProcessInfo.m
View file

@ -67,24 +67,35 @@
# include <errno.h>
#endif
#ifdef HAVE_SYS_SIGNAL_H
#include <sys/signal.h>
#endif
#ifdef HAVE_SIGNAL_H
#include <signal.h>
#if defined(HAVE_SYS_SIGNAL_H)
# include <sys/signal.h>
#elif defined(HAVE_SIGNAL_H)
# include <signal.h>
#endif
#include <sys/file.h>
#ifdef HAVE_SYS_FCNTL_H
#include <sys/fcntl.h>
#if defined(HAVE_SYS_FILE_H)
# include <sys/file.h>
#endif
#if defined(HAVE_SYS_FCNTL_H)
# include <sys/fcntl.h>
#elif defined(HAVE_FCNTL_H)
# include <fcntl.h>
#endif
#ifdef HAVE_SYS_UTSNAME_H
#include <sys/utsname.h>
#endif
#ifdef HAVE_KVM_ENV
#include <kvm.h>
#include <fcntl.h>
#if defined(HAVE_SYS_FCNTL_H)
# include <sys/fcntl.h>
#elif defined(HAVE_FCNTL_H)
# include <fcntl.h>
#endif
#include <sys/param.h>
#endif /* HAVE_KVM_ENV */

14
Source/NSSocketPort.m
View file

@ -59,7 +59,13 @@
#endif /* !__MINGW__ */
#include <string.h> /* for strchr() */
#include <ctype.h> /* for strchr() */
#include <fcntl.h>
#if defined(HAVE_SYS_FCNTL_H)
# include <sys/fcntl.h>
#elif defined(HAVE_FCNTL_H)
# include <fcntl.h>
#endif
#ifdef __MINGW__
#include <winsock2.h>
#include <wininet.h>
@ -70,7 +76,11 @@
#include <sys/resource.h>
#include <netdb.h>
#include <sys/socket.h>
#include <sys/file.h>
#if defined(HAVE_SYS_FILE_H)
# include <sys/file.h>
#endif
/*
* Stuff for setting the sockets into non-blocking mode.
*/

8
Source/NSString.m
View file

@ -77,7 +77,13 @@
#import "GSPrivate.h"
#include <sys/stat.h>
#include <sys/types.h>
#include <fcntl.h>
#if defined(HAVE_SYS_FCNTL_H)
# include <sys/fcntl.h>
#elif defined(HAVE_FCNTL_H)
# include <fcntl.h>
#endif
#include <stdio.h>
#include <wchar.h>

22
Source/NSTask.m
View file

@ -59,18 +59,22 @@
# include <windows.h>
#endif
#ifdef HAVE_SYS_SIGNAL_H
#include <sys/signal.h>
#if defined(HAVE_SYS_SIGNAL_H)
# include <sys/signal.h>
#elif defined(HAVE_SIGNAL_H)
# include <signal.h>
#endif
#ifdef HAVE_SIGNAL_H
#include <signal.h>
#if defined(HAVE_SYS_FILE_H)
# include <sys/file.h>
#endif
#ifdef HAVE_SYS_FILE_H
#include <sys/file.h>
#endif
#ifdef HAVE_SYS_FCNTL_H
#include <sys/fcntl.h>
#if defined(HAVE_SYS_FCNTL_H)
# include <sys/fcntl.h>
#elif defined(HAVE_FCNTL_H)
# include <fcntl.h>
#endif
#ifdef HAVE_SYS_IOCTL_H
#include <sys/ioctl.h>
#endif

12
Source/NSThread.m
View file

@ -45,11 +45,15 @@
#ifdef HAVE_PTHREAD_H
#include <pthread.h>
#endif
#ifdef HAVE_SYS_FILE_H
#include <sys/file.h>
#if defined(HAVE_SYS_FILE_H)
# include <sys/file.h>
#endif
#ifdef HAVE_SYS_FCNTL_H
#include <sys/fcntl.h>
#if defined(HAVE_SYS_FCNTL_H)
# include <sys/fcntl.h>
#elif defined(HAVE_FCNTL_H)
# include <fcntl.h>
#endif
#ifdef __POSIX_SOURCE

14
Tools/gdnc.m
View file

@ -44,12 +44,22 @@
#include "process.h"
#endif
#include <fcntl.h>
#if defined(HAVE_SYS_FCNTL_H)
# include <sys/fcntl.h>
#elif defined(HAVE_FCNTL_H)
# include <fcntl.h>
#endif
#ifdef HAVE_SYSLOG_H
#include <syslog.h>
#endif
#include <signal.h>
#if defined(HAVE_SYS_SIGNAL_H)
# include <sys/signal.h>
#elif defined(HAVE_SIGNAL_H)
# include <signal.h>
#endif
#ifndef NSIG
#define NSIG 32

19892
configure vendored
View file

File diff suppressed because it is too large Load diff

23
configure.ac
View file

@ -2155,10 +2155,27 @@ AC_DEFINE_UNQUOTED(HAVE_PTS_STREAM_MODULES, $HAVE_PTS_STREAM_MODULES,
[Define this if you work on sysv])
AC_SUBST(HAVE_PTS_STREAM_MODULES)
AC_CHECK_HEADERS(libc.h limits.h malloc.h memory.h string.h signal.h dnl
AC_CHECK_HEADERS(dnl
fcntl.h dnl
inttypes.h dnl
libc.h dnl
limits.h dnl
malloc.h dnl
memory.h dnl
signal.h dnl
stdint.h dnl
string.h dnl
sys/fcntl.h dnl
sys/file.h dnl
sys/inttypes.h dnl
sys/ioctl.h dnl
sys/signal.h dnl
sys/stropts.h dnl
sys/wait.h dnl
unistd.h dnl
utime.h dnl
stdlib.h dnl
sys/signal.h sys/wait.h sys/file.h sys/fcntl.h sys/ioctl.h dnl
sys/stropts.h unistd.h utime.h stdint.h inttypes.h sys/inttypes.h)
)
if test $ac_cv_header_stdint_h = yes; then
INCLUDE_STDINT="#include <stdint.h>"