Pidgin
Trac is being migrated to new services! Issues can be found in our new YouTrack instance and WIKI pages can be found on our website.

BuildingWinNSS: nss-wdk-3.24.patch

File nss-wdk-3.24.patch, 11.8 KB (added by datallah, 8 years ago)

  • nspr/config/config.mk 

    diff -ur -xdist -x 'WINNT*_OPT.OBJ' -x '*.rej' -x '*.orig' -x '*~' nss-3.24.orig/nspr/config/config.mk nss-3.24/nspr/config/config.mk
    old new  
    132132DEFINES += -DMOZ_UNICODE
    133133endif
    134134
     135ifdef WINDDK_BUILD
     136OS_CFLAGS += -DWINDDK_BUILD
     137ifdef USE_64
     138OS_LIBS += msvcrt_win2003.obj
     139else
     140OS_LIBS += msvcrt_winxp.obj
     141endif
     142endif
     143
    135144####################################################################
    136145#
    137146# Configuration for the release process

  • nspr/pr/include/pratom.h 

    diff -ur -xdist -x 'WINNT*_OPT.OBJ' -x '*.rej' -x '*.orig' -x '*~' nss-3.24.orig/nspr/pr/include/pratom.h nss-3.24/nspr/pr/include/pratom.h
    old new  
    7979**    interchangeably.
    8080*/
    8181#if defined(_WIN32) && !defined(_WIN32_WCE) && \
     82    !defined(WINDDK_BUILD) && \
    8283    (!defined(_MSC_VER) || (_MSC_VER >= 1310))
    8384
    8485#include <intrin.h>

  • nspr/pr/include/prbit.h 

    diff -ur -xdist -x 'WINNT*_OPT.OBJ' -x '*.rej' -x '*.orig' -x '*~' nss-3.24.orig/nspr/pr/include/prbit.h nss-3.24/nspr/pr/include/prbit.h
    old new  
    1414** functions.
    1515*/
    1616#if defined(_WIN32) && (_MSC_VER >= 1300) && \
     17    !defined(WINDDK_BUILD) && \
    1718    (defined(_M_IX86) || defined(_M_AMD64) || defined(_M_ARM))
    1819# include <intrin.h>
    1920# pragma  intrinsic(_BitScanForward,_BitScanReverse)

  • nspr/pr/src/Makefile.in 

    diff -ur -xdist -x 'WINNT*_OPT.OBJ' -x '*.rej' -x '*.orig' -x '*~' nss-3.24.orig/nspr/pr/src/Makefile.in nss-3.24/nspr/pr/src/Makefile.in
    old new  
    167167ifdef NS_USE_GCC
    168168OS_LIBS         = -ladvapi32 -lws2_32 -lmswsock -lwinmm
    169169else
     170ifdef WINDDK_BUILD
     171ifdef USE_64
     172OS_LIBS = advapi32.lib wsock32.lib winmm.lib msvcrt_win2003.obj
     173else
     174OS_LIBS = advapi32.lib wsock32.lib winmm.lib msvcrt_winxp.obj
     175endif
     176else
    170177OS_LIBS         = advapi32.lib ws2_32.lib mswsock.lib winmm.lib
    171178endif
    172179endif
     180endif
    173181
    174182ifeq ($(OS_ARCH),WINCE)
    175183OS_LIBS         = ws2.lib

  • nspr/pr/src/md/windows/ntmisc.c 

    diff -ur -xdist -x 'WINNT*_OPT.OBJ' -x '*.rej' -x '*.orig' -x '*~' nss-3.24.orig/nspr/pr/src/md/windows/ntmisc.c nss-3.24/nspr/pr/src/md/windows/ntmisc.c
    old new  
    593593     */
    594594    hasFdInheritBuffer = (attr && attr->fdInheritBuffer);
    595595    if ((envp == NULL) && hasFdInheritBuffer) {
     596#ifdef WINDDK_BUILD
     597        envp = getenv;
     598#else
    596599        envp = environ;
     600#endif
    597601    }
    598602
    599603    if (envp != NULL) {

  • nss/cmd/httpserv/httpserv.c 

    diff -ur -xdist -x 'WINNT*_OPT.OBJ' -x '*.rej' -x '*.orig' -x '*~' nss-3.24.orig/nss/cmd/httpserv/httpserv.c nss-3.24/nss/cmd/httpserv/httpserv.c
    old new  
    1212#endif
    1313
    1414#if defined(_WINDOWS)
     15#ifdef WINDDK_BUILD
     16#include <windows.h>
     17#define getpid GetCurrentProcessId
     18#else
    1519#include <process.h> /* for getpid() */
    1620#endif
     21#endif
    1722
    1823#include <signal.h>
    1924#include <stdlib.h>

  • nss/cmd/platlibs.mk 

    diff -ur -xdist -x 'WINNT*_OPT.OBJ' -x '*.rej' -x '*.orig' -x '*~' nss-3.24.orig/nss/cmd/platlibs.mk nss-3.24/nss/cmd/platlibs.mk
    old new  
    260260endif
    261261
    262262JAR_LIBS = $(DIST)/lib/$(LIB_PREFIX)jar.$(LIB_SUFFIX)
     263
     264ifdef WINDDK_BUILD
     265ifdef USE_64
     266OS_LIBS += msvcrt_win2003.obj
     267else
     268OS_LIBS += msvcrt_winxp.obj
     269endif
     270endif

  • nss/cmd/selfserv/selfserv.c 

    diff -ur -xdist -x 'WINNT*_OPT.OBJ' -x '*.rej' -x '*.orig' -x '*~' nss-3.24.orig/nss/cmd/selfserv/selfserv.c nss-3.24/nss/cmd/selfserv/selfserv.c
    old new  
    1818#endif
    1919
    2020#if defined(_WINDOWS)
     21#ifdef WINDDK_BUILD
     22#include <windows.h>
     23#define getpid GetCurrentProcessId
     24#else
    2125#include <process.h> /* for getpid() */
    2226#endif
     27#endif
    2328
    2429#include <signal.h>
    2530#include <stdlib.h>

  • nss/coreconf/arch.mk 

    diff -ur -xdist -x 'WINNT*_OPT.OBJ' -x '*.rej' -x '*.orig' -x '*~' nss-3.24.orig/nss/coreconf/arch.mk nss-3.24/nss/coreconf/arch.mk
    old new  
    210210# the uname.exe in the MSYS toolkit.
    211211#
    212212ifeq (MINGW32_NT,$(findstring MINGW32_NT,$(OS_ARCH)))
    213     OS_RELEASE := $(patsubst MINGW32_NT-%,%,$(OS_ARCH))
     213    ifdef WINDDK_BUILD
     214        ifdef USE_64
     215            OS_RELEASE := 5.2
     216        else
     217            OS_RELEASE := 5.1
     218        endif
     219    else
     220        OS_RELEASE := $(patsubst MINGW32_NT-%,%,$(OS_ARCH))
     221    endif
    214222    OS_ARCH = WINNT
    215223    USE_MSYS = 1
    216224    ifndef CPU_ARCH

  • nss/coreconf/WIN32.mk 

    diff -ur -xdist -x 'WINNT*_OPT.OBJ' -x '*.rej' -x '*.orig' -x '*~' nss-3.24.orig/nss/coreconf/WIN32.mk nss-3.24/nss/coreconf/WIN32.mk
    old new  
    132132    ifeq ($(NSS_ENABLE_WERROR),1)
    133133        WARNING_CFLAGS += -WX
    134134    endif
     135    ifdef WINDDK_BUILD
     136        OS_CFLAGS += -DWINDDK_BUILD
     137        ifdef USE_64
     138            OS_LIBS += msvcrt_win2003.obj
     139        else
     140            OS_LIBS += msvcrt_winxp.obj
     141        endif
     142    endif
    135143    ifeq ($(_MSC_VER),$(_MSC_VER_6))
    136144    ifndef MOZ_DEBUG_SYMBOLS
    137145        OS_DLLFLAGS += -PDB:NONE

  • nss/lib/dbm/include/mcom_db.h 

    diff -ur -xdist -x 'WINNT*_OPT.OBJ' -x '*.rej' -x '*.orig' -x '*~' nss-3.24.orig/nss/lib/dbm/include/mcom_db.h nss-3.24/nss/lib/dbm/include/mcom_db.h
    old new  
    3535#ifndef _DB_H_
    3636#define _DB_H_
    3737
     38#ifdef WINDDK_BUILD
     39#ifndef stat
     40#define stat _stat
     41#endif
     42#ifndef getpid
     43#define getpid GetCurrentProcessId
     44#endif
     45#endif
     46
    3847#ifndef macintosh
    3948#include <sys/types.h>
    4049#endif

  • nss/lib/dbm/src/mktemp.c 

    diff -ur -xdist -x 'WINNT*_OPT.OBJ' -x '*.rej' -x '*.orig' -x '*~' nss-3.24.orig/nss/lib/dbm/src/mktemp.c nss-3.24/nss/lib/dbm/src/mktemp.c
    old new  
    4545#include <ctype.h>
    4646#include "mcom_db.h"
    4747
    48 #ifndef _WINDOWS
    49 #include <unistd.h>
    50 #endif
    51 
    5248#ifdef _WINDOWS
     49#ifndef WINDDK_BUILD
    5350#include <process.h>
     51#endif
    5452#include "winfile.h"
     53#else
     54#include <unistd.h>
    5555#endif
    5656
    5757static int _gettemp(char *path, register int *doopen, int extraFlags);

  • nss/lib/freebl/chacha20.h 

    diff -ur -xdist -x 'WINNT*_OPT.OBJ' -x '*.rej' -x '*.orig' -x '*~' nss-3.24.orig/nss/lib/freebl/chacha20.h nss-3.24/nss/lib/freebl/chacha20.h
    old new  
    88#ifndef FREEBL_CHACHA20_H_
    99#define FREEBL_CHACHA20_H_
    1010
    11 #if defined(_MSC_VER) && _MSC_VER < 1600
     11#if defined(_MSC_VER) && (_MSC_VER < 1600 || defined(WINDDK_BUILD))
    1212#include "prtypes.h"
    1313typedef PRUint32 uint32_t;
    1414typedef PRUint64 uint64_t;

  • nss/lib/freebl/Makefile 

    diff -ur -xdist -x 'WINNT*_OPT.OBJ' -x '*.rej' -x '*.orig' -x '*~' nss-3.24.orig/nss/lib/freebl/Makefile nss-3.24/nss/lib/freebl/Makefile
    old new  
    153153    # The Intel AES assembly code requires Visual C++ 2010.
    154154    # if $(_MSC_VER) >= 1600 (Visual C++ 2010)
    155155    ifeq ($(firstword $(sort $(_MSC_VER) 1600)),1600)
     156        ifndef WINDDK_BUILD
    156157        DEFINES += -DUSE_HW_AES -DINTEL_GCM
    157158        ASFILES += intel-aes-x86-masm.asm intel-gcm-x86-masm.asm
    158159        EXTRA_SRCS += intel-gcm-wrap.c
    159160        ifeq ($(CLANG_CL),1)
    160161            INTEL_GCM_CLANG_CL = 1
    161162        endif
     163        endif
    162164    endif
    163165endif
    164166else

  • nss/lib/freebl/mpi/mpcpucache.c 

    diff -ur -xdist -x 'WINNT*_OPT.OBJ' -x '*.rej' -x '*.orig' -x '*~' nss-3.24.orig/nss/lib/freebl/mpi/mpcpucache.c nss-3.24/nss/lib/freebl/mpi/mpcpucache.c
    old new  
    4848
    4949#elif defined(_MSC_VER)
    5050
     51#ifdef WINDDK_BUILD
     52#include <ntddk.h>
     53#else
    5154#include <intrin.h>
     55#endif
    5256
    5357void freebl_cpuid(unsigned long op, unsigned long *eax,
    5458           unsigned long *ebx, unsigned long *ecx,

  • nss/lib/freebl/poly1305.c 

    diff -ur -xdist -x 'WINNT*_OPT.OBJ' -x '*.rej' -x '*.orig' -x '*~' nss-3.24.orig/nss/lib/freebl/poly1305.c nss-3.24/nss/lib/freebl/poly1305.c
    old new  
    1010
    1111#include "poly1305.h"
    1212
    13 #if defined(_MSC_VER) && _MSC_VER < 1600
     13#if defined(_MSC_VER) && (_MSC_VER < 1600 || defined(WINDDK_BUILD))
    1414#include "prtypes.h"
    1515typedef PRUint32 uint32_t;
    1616typedef PRUint64 uint64_t;

  • nss/lib/softoken/legacydb/config.mk 

    diff -ur -xdist -x 'WINNT*_OPT.OBJ' -x '*.rej' -x '*.orig' -x '*~' nss-3.24.orig/nss/lib/softoken/legacydb/config.mk nss-3.24/nss/lib/softoken/legacydb/config.mk
    old new  
    5555        -lnspr4 \
    5656        $(NULL)
    5757endif
     58
     59ifdef WINDDK_BUILD
     60ifdef USE_64
     61OS_LIBS += msvcrt_win2003.obj
     62else
     63OS_LIBS += msvcrt_winxp.obj
     64endif
     65endif

  • nss/lib/sqlite/sqlite3.c 

    diff -ur -xdist -x 'WINNT*_OPT.OBJ' -x '*.rej' -x '*.orig' -x '*~' nss-3.24.orig/nss/lib/sqlite/sqlite3.c nss-3.24/nss/lib/sqlite/sqlite3.c
    old new  
    91539153*/
    91549154#if !defined(SQLITE_DISABLE_INTRINSIC)
    91559155#  if defined(_MSC_VER) && _MSC_VER>=1300
    9156 #    if !defined(_WIN32_WCE)
     9156#    if defined(WINDDK_BUILD)
     9157#      include <emmintrin.h>
     9158#      pragma intrinsic(_byteswap_ushort)
     9159#      pragma intrinsic(_byteswap_ulong)
     9160#      pragma intrinsic(_ReadWriteBarrier)
     9161#    elif !defined(_WIN32_WCE)
    91579162#      include <intrin.h>
    91589163#      pragma intrinsic(_byteswap_ushort)
    91599164#      pragma intrinsic(_byteswap_ulong)
    … …  
    1686216867** localtime_s().
    1686316868*/
    1686416869#if !HAVE_LOCALTIME_R && !HAVE_LOCALTIME_S \
    16865     && defined(_MSC_VER) && defined(_CRT_INSECURE_DEPRECATE)
     16870    && defined(_MSC_VER) && defined(_CRT_INSECURE_DEPRECATE) \
     16871    && !defined(WINDDK_BUILD)
    1686616872#undef  HAVE_LOCALTIME_S
    1686716873#define HAVE_LOCALTIME_S 1
    1686816874#endif

  • nss/lib/ssl/sslimpl.h 

    diff -ur -xdist -x 'WINNT*_OPT.OBJ' -x '*.rej' -x '*.orig' -x '*~' nss-3.24.orig/nss/lib/ssl/sslimpl.h nss-3.24/nss/lib/ssl/sslimpl.h
    old new  
    19911991#if defined(XP_UNIX) || defined(XP_OS2) || defined(XP_BEOS)
    19921992#define SSL_GETPID getpid
    19931993#elif defined(WIN32)
     1994#ifdef WINDDK_BUILD
     1995#include <windows.h>
     1996#define SSL_GETPID GetCurrentProcessId
     1997#else
    19941998extern int __cdecl _getpid(void);
    19951999#define SSL_GETPID _getpid
     2000#endif
    19962001#else
    19972002#define SSL_GETPID() 0
    19982003#endif

  • nss/lib/zlib/config.mk 

    diff -ur -xdist -x 'WINNT*_OPT.OBJ' -x '*.rej' -x '*.orig' -x '*~' nss-3.24.orig/nss/lib/zlib/config.mk nss-3.24/nss/lib/zlib/config.mk
    old new  
    1818ifeq ($(OS_TARGET),Linux)
    1919DEFINES += -DHAVE_UNISTD_H
    2020endif
     21
     22ifdef WINDDK_BUILD
     23ifdef USE_64
     24OS_LIBS += msvcrt_win2003.obj
     25else
     26OS_LIBS += msvcrt_winxp.obj
     27endif
     28endif
     29
All information, including names and email addresses, entered onto this website or sent to mailing lists affiliated with this website will be public. Do not post confidential information, especially passwords!