Skip to content
This repository has been archived by the owner on Apr 22, 2023. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: nodejs/node-v0.x-archive
base: bf3e0f417bbf
Choose a base ref
...
head repository: nodejs/node-v0.x-archive
compare: 0308ad2ce53f
Choose a head ref
  • 2 commits
  • 13 files changed
  • 1 contributor

Commits on Nov 26, 2014

  1. deps: update libuv to 1.0.1 

    PR-URL: #8785
Reviewed-by: Trevor Norris <trev.norris@gmail.com>
    @saghul @trevnorris
    saghul authored and trevnorris committed Nov 26, 2014
    Copy the full SHA
    69904c8 View commit details
    Browse the repository at this point in the history

  2. crypto: cast uv_thread_t to unsigned long 

    Should work in all platforms and it fixes this compilation problem
on OSX:

../src/node_crypto.cc:154:3: error: no matching function for call to
'CRYPTO_THREADID_set_numeric'
  CRYPTO_THREADID_set_numeric(tid, uv_thread_self());
    ^~~~~~~~~~~~~~~~~~~~~~~~~~~
    ../deps/openssl/openssl/include/openssl/../../crypto/crypto.h:435:6:
    note: candidate function not viable: no known conversion from
          'uv_thread_t' (aka '_opaque_pthread_t *') to 'unsigned long'
          for 2nd argument
          void CRYPTO_THREADID_set_numeric(CRYPTO_THREADID *id, unsigned
          long val);
               ^
               1 error generated.

PR-URL: #8785
Reviewed-by: Trevor Norris <trev.norris@gmail.com>
    @saghul @trevnorris
    saghul authored and trevnorris committed Nov 26, 2014
    Copy the full SHA
    0308ad2 View commit details
    Browse the repository at this point in the history