=== modified file 'src/libs/xpcom18a4/nsprpub/config/nsinstall.c'
|
|
|
|
| 98 | 98 | } |
| 99 | 99 | #endif /* NEXTSTEP */ |
| 100 | 100 | |
| 101 | | #ifdef LINUX |
| | 101 | #if defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) |
| 102 | 102 | #include <getopt.h> |
| 103 | 103 | #endif |
| 104 | 104 | |
=== modified file 'src/libs/xpcom18a4/nsprpub/configure.in'
|
|
|
|
| 1178 | 1178 | esac |
| 1179 | 1179 | ;; |
| 1180 | 1180 | |
| 1181 | | *-linux*) |
| | 1181 | *-linux*|*-gnu*|*-k*bsd*-gnu) |
| 1182 | 1182 | if test -z "$USE_NSPR_THREADS"; then |
| 1183 | 1183 | USE_PTHREADS=1 |
| 1184 | 1184 | IMPL_STRATEGY=_PTH |
| … |
… |
|
| 1189 | 1189 | AC_DEFINE(_SVID_SOURCE) |
| 1190 | 1190 | AC_DEFINE(_LARGEFILE64_SOURCE) |
| 1191 | 1191 | AC_DEFINE(HAVE_FCNTL_FILE_LOCKING) |
| 1192 | | AC_DEFINE(LINUX) |
| | 1192 | case "${target_os}" in |
| | 1193 | linux*) |
| | 1194 | AC_DEFINE(LINUX) |
| | 1195 | ;; |
| | 1196 | esac |
| 1193 | 1197 | CFLAGS="$CFLAGS -ansi -Wall" |
| 1194 | 1198 | CXXFLAGS="$CXXFLAGS -ansi -Wall" |
| 1195 | 1199 | MDCPUCFG_H=_linux.cfg |
| … |
… |
|
| 2222 | 2226 | _PTHREAD_LDFLAGS=-pthread |
| 2223 | 2227 | fi |
| 2224 | 2228 | ;; |
| 2225 | | *-linux*) |
| | 2229 | *-linux*|*-gnu*|*-k*bsd*-gnu) |
| 2226 | 2230 | AC_DEFINE(_REENTRANT) |
| 2227 | 2231 | ;; |
| 2228 | 2232 | esac |
| … |
… |
|
| 2306 | 2310 | fi |
| 2307 | 2311 | fi |
| 2308 | 2312 | ;; |
| 2309 | | *-linux*) |
| | 2313 | *-linux*|*-gnu*|*-k*bsd*-gnu) |
| 2310 | 2314 | if test -n "$USE_NSPR_THREADS"; then |
| 2311 | 2315 | AC_DEFINE(_PR_LOCAL_THREADS_ONLY) |
| 2312 | 2316 | fi |
=== modified file 'src/libs/xpcom18a4/nsprpub/pr/include/md/_linux.cfg'
|
|
|
|
| 35 | 35 | * |
| 36 | 36 | * ***** END LICENSE BLOCK ***** */ |
| 37 | 37 | |
| | 38 | /* |
| | 39 | * This file is used by not only Linux but also other glibc systems |
| | 40 | * such as GNU/Hurd and GNU/k*BSD. |
| | 41 | */ |
| | 42 | |
| 38 | 43 | #ifndef nspr_cpucfg___ |
| 39 | 44 | #define nspr_cpucfg___ |
| 40 | 45 | |
| … |
… |
|
| 42 | 47 | #define XP_UNIX |
| 43 | 48 | #endif |
| 44 | 49 | |
| 45 | | #ifndef LINUX |
| | 50 | #if !defined(LINUX) && defined(__linux__) |
| 46 | 51 | #define LINUX |
| 47 | 52 | #endif |
| 48 | 53 | |
=== modified file 'src/libs/xpcom18a4/nsprpub/pr/include/md/_pth.h'
|
|
|
|
| 139 | 139 | (!memcmp(&(t), &pt_zero_tid, sizeof(pthread_t))) |
| 140 | 140 | #define _PT_PTHREAD_COPY_THR_HANDLE(st, dt) (dt) = (st) |
| 141 | 141 | #elif defined(IRIX) || defined(OSF1) || defined(AIX) || defined(SOLARIS) \ |
| | 142 | || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \ |
| 142 | 143 | || defined(HPUX) || defined(LINUX) || defined(FREEBSD) \ |
| 143 | 144 | || defined(NETBSD) || defined(OPENBSD) || defined(BSDI) \ |
| 144 | 145 | || defined(VMS) || defined(NTO) || defined(DARWIN) \ |
| … |
… |
|
| 191 | 192 | /* |
| 192 | 193 | * These platforms don't have sigtimedwait() |
| 193 | 194 | */ |
| 194 | | #if (defined(AIX) && !defined(AIX4_3_PLUS)) || defined(LINUX) \ |
| | 195 | #if (defined(AIX) && !defined(AIX4_3_PLUS)) \ |
| | 196 | || defined(LINUX) || defined(__GNU__)|| defined(__GLIBC__) \ |
| 195 | 197 | || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \ |
| 196 | 198 | || defined(BSDI) || defined(VMS) || defined(UNIXWARE) \ |
| 197 | 199 | || defined(DARWIN) |
| … |
… |
|
| 231 | 233 | #define PT_PRIO_MAX sched_get_priority_max(SCHED_OTHER) |
| 232 | 234 | #endif /* defined(_PR_DCETHREADS) */ |
| 233 | 235 | |
| 234 | | #elif defined(LINUX) || defined(FREEBSD) |
| | 236 | #elif defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \ |
| | 237 | || defined(FREEBSD) |
| 235 | 238 | #define PT_PRIO_MIN sched_get_priority_min(SCHED_OTHER) |
| 236 | 239 | #define PT_PRIO_MAX sched_get_priority_max(SCHED_OTHER) |
| 237 | 240 | #elif defined(NTO) |
| … |
… |
|
| 286 | 289 | onemillisec.tv_nsec = 1000000L; \ |
| 287 | 290 | nanosleep(&onemillisec,NULL); \ |
| 288 | 291 | PR_END_MACRO |
| 289 | | #elif defined(HPUX) || defined(LINUX) || defined(SOLARIS) \ |
| | 292 | #elif defined(HPUX) || defined(SOLARIS) \ |
| | 293 | || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \ |
| 290 | 294 | || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \ |
| 291 | 295 | || defined(BSDI) || defined(NTO) || defined(DARWIN) \ |
| 292 | 296 | || defined(UNIXWARE) |
=== modified file 'src/libs/xpcom18a4/nsprpub/pr/include/md/_unixos.h'
|
|
|
|
| 46 | 46 | * Linux: FD_SETSIZE is defined in /usr/include/sys/select.h and should |
| 47 | 47 | * not be redefined. |
| 48 | 48 | */ |
| 49 | | #if !defined(LINUX) && !defined(DARWIN) && !defined(NEXTSTEP) && !defined(L4ENV) |
| | 49 | #if !defined(LINUX) && !defined(__GNU__) && !defined(__GLIBC__) \ |
| | 50 | && !defined(DARWIN) && !defined(NEXTSTEP) && !defined(L4ENV) |
| 50 | 51 | #ifndef FD_SETSIZE |
| 51 | 52 | #define FD_SETSIZE 4096 |
| 52 | 53 | #endif |
=== modified file 'src/libs/xpcom18a4/nsprpub/pr/include/md/_vbox.cfg'
|
|
|
|
| 45 | 45 | # include <md/_freebsd.cfg> |
| 46 | 46 | #elif defined(RT_OS_L4) |
| 47 | 47 | # include <md/_l4v2.cfg> |
| 48 | | #elif defined(RT_OS_LINUX) |
| | 48 | #elif defined(RT_OS_LINUX) || defined(__GNU__) || defined(__GLIBC__) |
| 49 | 49 | # include <md/_linux.cfg> |
| 50 | 50 | #elif defined(RT_OS_NETBSD) |
| 51 | 51 | # include <md/_netbsd.cfg> |
=== modified file 'src/libs/xpcom18a4/nsprpub/pr/include/md/prosdep.h'
|
|
|
|
| 90 | 90 | #elif defined(IRIX) |
| 91 | 91 | #include "md/_irix.h" |
| 92 | 92 | |
| 93 | | #elif defined(LINUX) |
| | 93 | #elif defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) |
| 94 | 94 | #include "md/_linux.h" |
| 95 | 95 | |
| 96 | 96 | #elif defined(OSF1) |
=== modified file 'src/libs/xpcom18a4/nsprpub/pr/src/linking/Makefile.in'
|
|
|
|
| 63 | 63 | INCLUDES = -I$(dist_includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private |
| 64 | 64 | |
| 65 | 65 | # For Dl_info and dladdr. |
| 66 | | ifeq ($(OS_TARGET),Linux) |
| | 66 | ifeq (,$(filter-out Linux GNU GNU_%,$(OS_TARGET))) |
| 67 | 67 | DEFINES += -D_GNU_SOURCE |
| 68 | 68 | endif |
| 69 | 69 | |
=== modified file 'src/libs/xpcom18a4/nsprpub/pr/src/linking/prlink.c'
|
|
|
|
| 1810 | 1810 | PR_IMPLEMENT(char *) |
| 1811 | 1811 | PR_GetLibraryFilePathname(const char *name, PRFuncPtr addr) |
| 1812 | 1812 | { |
| 1813 | | #if defined(SOLARIS) || defined(LINUX) || defined(FREEBSD) |
| | 1813 | #if defined(SOLARIS) || defined(FREEBSD) \ |
| | 1814 | || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) |
| 1814 | 1815 | Dl_info dli; |
| 1815 | 1816 | char *result; |
| 1816 | 1817 | |
=== modified file 'src/libs/xpcom18a4/nsprpub/pr/src/md/prosdep.c'
|
|
|
|
| 63 | 63 | |
| 64 | 64 | /* Get page size */ |
| 65 | 65 | #ifdef XP_UNIX |
| 66 | | #if defined SUNOS4 || defined LINUX || defined BSDI || defined AIX \ |
| | 66 | #if defined SUNOS4 || defined BSDI || defined AIX \ |
| | 67 | || defined LINUX || defined __GNU__ || defined __GLIBC__ \ |
| 67 | 68 | || defined FREEBSD || defined NETBSD || defined OPENBSD \ |
| 68 | 69 | || defined DARWIN || defined NEXTSTEP |
| 69 | 70 | _pr_pageSize = getpagesize(); |
=== modified file 'src/libs/xpcom18a4/nsprpub/pr/src/md/unix/unix.c'
|
|
|
|
| 65 | 65 | * PRInt32* pointer to a _PRSockLen_t* pointer. |
| 66 | 66 | */ |
| 67 | 67 | #if defined(HAVE_SOCKLEN_T) \ |
| 68 | | || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) \ |
| | 68 | || (defined(__GLIBC__) && __GLIBC__ >= 2) \ |
| 69 | 69 | || defined(L4ENV) |
| 70 | 70 | #define _PRSockLen_t socklen_t |
| 71 | 71 | #elif defined(IRIX) || defined(HPUX) || defined(OSF1) || defined(SOLARIS) \ |
=== modified file 'src/libs/xpcom18a4/nsprpub/pr/src/md/unix/uxproces.c'
|
|
|
|
| 99 | 99 | * that can share the virtual address space and file descriptors. |
| 100 | 100 | */ |
| 101 | 101 | #if (defined(IRIX) && !defined(_PR_PTHREADS)) \ |
| 102 | | || (defined(LINUX) && defined(_PR_PTHREADS)) |
| | 102 | || ((defined(LINUX) || defined(__GNU__) || defined(__GLIBC__)) \ |
| | 103 | && defined(_PR_PTHREADS)) |
| 103 | 104 | #define _PR_SHARE_CLONES |
| 104 | 105 | #endif |
| 105 | 106 | |
| … |
… |
|
| 113 | 114 | */ |
| 114 | 115 | |
| 115 | 116 | #if defined(_PR_GLOBAL_THREADS_ONLY) \ |
| 116 | | || (defined(_PR_PTHREADS) && !defined(LINUX)) |
| | 117 | || (defined(_PR_PTHREADS) \ |
| | 118 | && !defined(LINUX) && !defined(__GNU__) && !defined(__GLIBC__)) |
| 117 | 119 | #define _PR_NATIVE_THREADS |
| 118 | 120 | #endif |
| 119 | 121 | |
=== modified file 'src/libs/xpcom18a4/nsprpub/pr/src/md/unix/uxrng.c'
|
|
|
|
| 138 | 138 | return 0; |
| 139 | 139 | } |
| 140 | 140 | |
| 141 | 141 | |
| 142 | | #elif (defined(LINUX) || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD)) |
| | 142 | #elif (defined(LINUX) || defined(FREEBSD) || defined(__FreeBSD_kernel__) \ |
| | 143 | || defined(NETBSD) || defined(__NetBSD_kernel__) || defined(OPENBSD)) |
| 143 | 144 | #include <sys/types.h> |
| 144 | 145 | #include <sys/stat.h> |
#include <fcntl.h>
=== modified file 'src/libs/xpcom18a4/nsprpub/pr/src/misc/prnetdb.c'
|
|
|
|
| 108 | 108 | #define _PR_HAVE_GETPROTO_R_INT |
| 109 | 109 | #endif |
| 110 | 110 | |
| 111 | | #if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) || defined(L4ENV) |
| | 111 | #if (defined(__GLIBC__) && __GLIBC__ >= 2) || defined(L4ENV) |
| 112 | 112 | #define _PR_HAVE_GETPROTO_R |
| 113 | 113 | #define _PR_HAVE_5_ARG_GETPROTO_R |
| 114 | 114 | #endif |
=== modified file 'src/libs/xpcom18a4/nsprpub/pr/src/pthreads/ptio.c'
|
|
|
|
| 206 | 206 | #if defined(SOLARIS) |
| 207 | 207 | #define _PRSockOptVal_t char * |
| 208 | 208 | #elif defined(IRIX) || defined(OSF1) || defined(AIX) || defined(HPUX) \ |
| 209 | | || defined(LINUX) || defined(FREEBSD) || defined(BSDI) || defined(VMS) \ |
| | 209 | || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) || defined(FREEBSD) || defined(BSDI) || defined(VMS) \ |
| 210 | 210 | || defined(NTO) || defined(OPENBSD) || defined(DARWIN) \ |
| 211 | 211 | || defined(UNIXWARE) || defined(NETBSD) |
| 212 | 212 | #define _PRSockOptVal_t void * |
| … |
… |
|
| 220 | 220 | #define _PRSelectFdSetArg_t void * |
| 221 | 221 | #elif defined(IRIX) || (defined(AIX) && !defined(AIX4_1)) \ |
| 222 | 222 | || defined(OSF1) || defined(SOLARIS) \ |
| 223 | | || defined(HPUX10_30) || defined(HPUX11) || defined(LINUX) \ |
| | 223 | || defined(HPUX10_30) || defined(HPUX11) \ |
| | 224 | || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \ |
| 224 | 225 | || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \ |
| 225 | 226 | || defined(BSDI) || defined(VMS) || defined(NTO) || defined(DARWIN) \ |
| 226 | 227 | || defined(UNIXWARE) |
| … |
… |
|
| 304 | 305 | * most current systems. |
| 305 | 306 | */ |
| 306 | 307 | #if defined(HAVE_SOCKLEN_T) \ |
| 307 | | || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) |
| | 308 | || (defined(__GLIBC__) && __GLIBC__ >= 2) |
| 308 | 309 | typedef socklen_t pt_SockLen; |
| 309 | 310 | #elif (defined(AIX) && !defined(AIX4_1)) \ |
| 310 | 311 | || defined(VMS) |
| … |
… |
|
| 3258 | 3259 | }; |
| 3259 | 3260 | |
| 3260 | 3261 | #if defined(HPUX) || defined(OSF1) || defined(SOLARIS) || defined (IRIX) \ |
| 3261 | | || defined(AIX) || defined(LINUX) || defined(FREEBSD) || defined(NETBSD) \ |
| | 3262 | || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \ |
| | 3263 | || defined(AIX) || defined(FREEBSD) || defined(NETBSD) \ |
| 3262 | 3264 | || defined(OPENBSD) || defined(BSDI) || defined(VMS) || defined(NTO) \ |
| 3263 | 3265 | || defined(DARWIN) || defined(UNIXWARE) |
| 3264 | 3266 | #define _PR_FCNTL_FLAGS O_NONBLOCK |
| … |
… |
|
| 4757 | 4759 | |
| 4758 | 4760 | #include <sys/types.h> |
| 4759 | 4761 | #include <sys/time.h> |
| 4760 | | #if !defined(SUNOS4) && !defined(HPUX) && !defined(LINUX) |
| | 4762 | #if !defined(SUNOS4) && !defined(HPUX) \ |
| | 4763 | && !defined(LINUX) && !defined(__GNU__) && !defined(__GLIBC__) |
| 4761 | 4764 | #include <sys/select.h> |
| 4762 | 4765 | #endif |
| 4763 | 4766 | |
=== modified file 'src/libs/xpcom18a4/nsprpub/pr/tests/Makefile.in'
|
|
|
|
| 376 | 376 | EXTRA_LIBS = -lsocket -lnsl -lgen -lresolv |
| 377 | 377 | endif |
| 378 | 378 | |
| 379 | | ifeq ($(OS_ARCH), Linux) |
| 380 | | ifeq ($(OS_RELEASE), 1.2) |
| 381 | | EXTRA_LIBS = -ldl |
| 382 | | else |
| 383 | | LDOPTS += -Xlinker -rpath $(ABSOLUTE_LIB_DIR) |
| 384 | | ifeq ($(USE_PTHREADS),1) |
| 385 | | EXTRA_LIBS = -lpthread |
| 386 | | endif |
| | 379 | ifeq (,$(filter-out Linux GNU GNU_%,$(OS_ARCH))) |
| | 380 | LDOPTS += -Xlinker -rpath $(ABSOLUTE_LIB_DIR) |
| | 381 | ifeq ($(USE_PTHREADS),1) |
| | 382 | EXTRA_LIBS = -lpthread |
| 387 | 383 | endif |
| 388 | 384 | endif |
| 389 | 385 | |