VirtualBox

Ticket #9224: nspr.diff

File nspr.diff, 12.4 KB (added by Robert Millan, 13 years ago)
  • src/libs/xpcom18a4/nsprpub/config/nsinstall.c

    === modified file 'src/libs/xpcom18a4/nsprpub/config/nsinstall.c'
     
    9898}
    9999#endif /* NEXTSTEP */
    100100
    101 #ifdef LINUX
     101#if defined(LINUX) || defined(__GNU__) || defined(__GLIBC__)
    102102#include <getopt.h>
    103103#endif
    104104
  • src/libs/xpcom18a4/nsprpub/configure.in

    === modified file 'src/libs/xpcom18a4/nsprpub/configure.in'
     
    11781178        esac
    11791179    ;;
    11801180
    1181 *-linux*)
     1181*-linux*|*-gnu*|*-k*bsd*-gnu)
    11821182    if test -z "$USE_NSPR_THREADS"; then
    11831183        USE_PTHREADS=1
    11841184        IMPL_STRATEGY=_PTH
     
    11891189    AC_DEFINE(_SVID_SOURCE)
    11901190    AC_DEFINE(_LARGEFILE64_SOURCE)
    11911191    AC_DEFINE(HAVE_FCNTL_FILE_LOCKING)
    1192     AC_DEFINE(LINUX)
     1192    case "${target_os}" in
     1193    linux*)
     1194        AC_DEFINE(LINUX)
     1195        ;;
     1196    esac
    11931197    CFLAGS="$CFLAGS -ansi -Wall"
    11941198    CXXFLAGS="$CXXFLAGS -ansi -Wall"
    11951199    MDCPUCFG_H=_linux.cfg
     
    22222226            _PTHREAD_LDFLAGS=-pthread
    22232227        fi
    22242228        ;;
    2225     *-linux*)
     2229    *-linux*|*-gnu*|*-k*bsd*-gnu)
    22262230        AC_DEFINE(_REENTRANT)
    22272231        ;;
    22282232    esac
     
    23062310        fi
    23072311    fi
    23082312    ;;
    2309 *-linux*)
     2313*-linux*|*-gnu*|*-k*bsd*-gnu)
    23102314    if test -n "$USE_NSPR_THREADS"; then
    23112315        AC_DEFINE(_PR_LOCAL_THREADS_ONLY)
    23122316    fi
  • src/libs/xpcom18a4/nsprpub/pr/include/md/_linux.cfg

    === modified file 'src/libs/xpcom18a4/nsprpub/pr/include/md/_linux.cfg'
     
    3535 *
    3636 * ***** END LICENSE BLOCK ***** */
    3737
     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
    3843#ifndef nspr_cpucfg___
    3944#define nspr_cpucfg___
    4045
     
    4247#define XP_UNIX
    4348#endif
    4449
    45 #ifndef LINUX
     50#if !defined(LINUX) && defined(__linux__)
    4651#define LINUX
    4752#endif
    4853
  • src/libs/xpcom18a4/nsprpub/pr/include/md/_pth.h

    === modified file 'src/libs/xpcom18a4/nsprpub/pr/include/md/_pth.h'
     
    139139        (!memcmp(&(t), &pt_zero_tid, sizeof(pthread_t)))
    140140#define _PT_PTHREAD_COPY_THR_HANDLE(st, dt)   (dt) = (st)
    141141#elif defined(IRIX) || defined(OSF1) || defined(AIX) || defined(SOLARIS) \
     142        || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \
    142143        || defined(HPUX) || defined(LINUX) || defined(FREEBSD) \
    143144        || defined(NETBSD) || defined(OPENBSD) || defined(BSDI) \
    144145        || defined(VMS) || defined(NTO) || defined(DARWIN) \
     
    191192/*
    192193 * These platforms don't have sigtimedwait()
    193194 */
    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__) \
    195197        || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \
    196198        || defined(BSDI) || defined(VMS) || defined(UNIXWARE) \
    197199        || defined(DARWIN)
     
    231233#define PT_PRIO_MAX            sched_get_priority_max(SCHED_OTHER)
    232234#endif /* defined(_PR_DCETHREADS) */
    233235
    234 #elif defined(LINUX) || defined(FREEBSD)
     236#elif defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \
     237        || defined(FREEBSD)
    235238#define PT_PRIO_MIN            sched_get_priority_min(SCHED_OTHER)
    236239#define PT_PRIO_MAX            sched_get_priority_max(SCHED_OTHER)
    237240#elif defined(NTO)
     
    286289                onemillisec.tv_nsec = 1000000L;                 \
    287290        nanosleep(&onemillisec,NULL);                   \
    288291    PR_END_MACRO
    289 #elif defined(HPUX) || defined(LINUX) || defined(SOLARIS) \
     292#elif defined(HPUX) || defined(SOLARIS) \
     293        || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) \
    290294        || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \
    291295        || defined(BSDI) || defined(NTO) || defined(DARWIN) \
    292296        || defined(UNIXWARE)
  • src/libs/xpcom18a4/nsprpub/pr/include/md/_unixos.h

    === modified file 'src/libs/xpcom18a4/nsprpub/pr/include/md/_unixos.h'
     
    4646 * Linux: FD_SETSIZE is defined in /usr/include/sys/select.h and should
    4747 * not be redefined.
    4848 */
    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)
    5051#ifndef FD_SETSIZE
    5152#define FD_SETSIZE  4096
    5253#endif
  • src/libs/xpcom18a4/nsprpub/pr/include/md/_vbox.cfg

    === modified file 'src/libs/xpcom18a4/nsprpub/pr/include/md/_vbox.cfg'
     
    4545# include <md/_freebsd.cfg>
    4646#elif defined(RT_OS_L4)
    4747# include <md/_l4v2.cfg>
    48 #elif defined(RT_OS_LINUX)
     48#elif defined(RT_OS_LINUX) || defined(__GNU__) || defined(__GLIBC__)
    4949# include <md/_linux.cfg>
    5050#elif defined(RT_OS_NETBSD)
    5151# include <md/_netbsd.cfg>
  • src/libs/xpcom18a4/nsprpub/pr/include/md/prosdep.h

    === modified file 'src/libs/xpcom18a4/nsprpub/pr/include/md/prosdep.h'
     
    9090#elif defined(IRIX)
    9191#include "md/_irix.h"
    9292
    93 #elif defined(LINUX)
     93#elif defined(LINUX) || defined(__GNU__) || defined(__GLIBC__)
    9494#include "md/_linux.h"
    9595
    9696#elif defined(OSF1)
  • src/libs/xpcom18a4/nsprpub/pr/src/linking/Makefile.in

    === modified file 'src/libs/xpcom18a4/nsprpub/pr/src/linking/Makefile.in'
     
    6363INCLUDES = -I$(dist_includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
    6464
    6565# For Dl_info and dladdr.
    66 ifeq ($(OS_TARGET),Linux)
     66ifeq (,$(filter-out Linux GNU GNU_%,$(OS_TARGET)))
    6767DEFINES    += -D_GNU_SOURCE
    6868endif
    6969
  • src/libs/xpcom18a4/nsprpub/pr/src/linking/prlink.c

    === modified file 'src/libs/xpcom18a4/nsprpub/pr/src/linking/prlink.c'
     
    18101810PR_IMPLEMENT(char *)
    18111811PR_GetLibraryFilePathname(const char *name, PRFuncPtr addr)
    18121812{
    1813 #if defined(SOLARIS) || defined(LINUX) || defined(FREEBSD)
     1813#if defined(SOLARIS) || defined(FREEBSD) \
     1814        || defined(LINUX) || defined(__GNU__) || defined(__GLIBC__)
    18141815    Dl_info dli;
    18151816    char *result;
    18161817
  • src/libs/xpcom18a4/nsprpub/pr/src/md/prosdep.c

    === modified file 'src/libs/xpcom18a4/nsprpub/pr/src/md/prosdep.c'
     
    6363
    6464    /* Get page size */
    6565#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__ \
    6768        || defined FREEBSD || defined NETBSD || defined OPENBSD \
    6869        || defined DARWIN || defined NEXTSTEP
    6970    _pr_pageSize = getpagesize();
  • src/libs/xpcom18a4/nsprpub/pr/src/md/unix/unix.c

    === modified file 'src/libs/xpcom18a4/nsprpub/pr/src/md/unix/unix.c'
     
    6565 * PRInt32* pointer to a _PRSockLen_t* pointer.
    6666 */
    6767#if defined(HAVE_SOCKLEN_T) \
    68     || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) \
     68    || (defined(__GLIBC__) && __GLIBC__ >= 2) \
    6969    || defined(L4ENV)
    7070#define _PRSockLen_t socklen_t
    7171#elif defined(IRIX) || defined(HPUX) || defined(OSF1) || defined(SOLARIS) \
  • src/libs/xpcom18a4/nsprpub/pr/src/md/unix/uxproces.c

    === modified file 'src/libs/xpcom18a4/nsprpub/pr/src/md/unix/uxproces.c'
     
    9999 * that can share the virtual address space and file descriptors.
    100100 */
    101101#if (defined(IRIX) && !defined(_PR_PTHREADS)) \
    102         || (defined(LINUX) && defined(_PR_PTHREADS))
     102        || ((defined(LINUX) || defined(__GNU__) || defined(__GLIBC__)) \
     103        && defined(_PR_PTHREADS))
    103104#define _PR_SHARE_CLONES
    104105#endif
    105106
     
    113114 */
    114115
    115116#if defined(_PR_GLOBAL_THREADS_ONLY) \
    116         || (defined(_PR_PTHREADS) && !defined(LINUX))
     117        || (defined(_PR_PTHREADS) \
     118        && !defined(LINUX) && !defined(__GNU__) && !defined(__GLIBC__))
    117119#define _PR_NATIVE_THREADS
    118120#endif
    119121
  • src/libs/xpcom18a4/nsprpub/pr/src/md/unix/uxrng.c

    === modified file 'src/libs/xpcom18a4/nsprpub/pr/src/md/unix/uxrng.c'
     
    138138    return 0;
    139139}
    140140
    141141
    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))
    143144#include <sys/types.h>
    144145#include <sys/stat.h>
  • src/libs/xpcom18a4/nsprpub/pr/src/misc/prnetdb.c

     #include <fcntl.h>
    
    === modified file 'src/libs/xpcom18a4/nsprpub/pr/src/misc/prnetdb.c'
     
    108108#define _PR_HAVE_GETPROTO_R_INT
    109109#endif
    110110
    111 #if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) || defined(L4ENV)
     111#if (defined(__GLIBC__) && __GLIBC__ >= 2) || defined(L4ENV)
    112112#define _PR_HAVE_GETPROTO_R
    113113#define _PR_HAVE_5_ARG_GETPROTO_R
    114114#endif
  • src/libs/xpcom18a4/nsprpub/pr/src/pthreads/ptio.c

    === modified file 'src/libs/xpcom18a4/nsprpub/pr/src/pthreads/ptio.c'
     
    206206#if defined(SOLARIS)
    207207#define _PRSockOptVal_t char *
    208208#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) \
    210210    || defined(NTO) || defined(OPENBSD) || defined(DARWIN) \
    211211    || defined(UNIXWARE) || defined(NETBSD)
    212212#define _PRSockOptVal_t void *
     
    220220#define _PRSelectFdSetArg_t void *
    221221#elif defined(IRIX) || (defined(AIX) && !defined(AIX4_1)) \
    222222    || 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__) \
    224225    || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \
    225226    || defined(BSDI) || defined(VMS) || defined(NTO) || defined(DARWIN) \
    226227    || defined(UNIXWARE)
     
    304305 * most current systems.
    305306 */
    306307#if defined(HAVE_SOCKLEN_T) \
    307     || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
     308    || (defined(__GLIBC__) && __GLIBC__ >= 2)
    308309typedef socklen_t pt_SockLen;
    309310#elif (defined(AIX) && !defined(AIX4_1)) \
    310311    || defined(VMS)
     
    32583259};
    32593260
    32603261#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) \
    32623264    || defined(OPENBSD) || defined(BSDI) || defined(VMS) || defined(NTO) \
    32633265    || defined(DARWIN) || defined(UNIXWARE)
    32643266#define _PR_FCNTL_FLAGS O_NONBLOCK
     
    47574759
    47584760#include <sys/types.h>
    47594761#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__)
    47614764#include <sys/select.h>
    47624765#endif
    47634766
  • src/libs/xpcom18a4/nsprpub/pr/tests/Makefile.in

    === modified file 'src/libs/xpcom18a4/nsprpub/pr/tests/Makefile.in'
     
    376376    EXTRA_LIBS = -lsocket -lnsl -lgen -lresolv
    377377endif
    378378
    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
     379ifeq (,$(filter-out Linux GNU GNU_%,$(OS_ARCH)))
     380    LDOPTS += -Xlinker -rpath $(ABSOLUTE_LIB_DIR)
     381    ifeq ($(USE_PTHREADS),1)
     382        EXTRA_LIBS = -lpthread
    387383    endif
    388384endif
    389385

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy