Changeset 27994 in webkit


Ignore:
Timestamp:
Nov 23, 2007 4:52:18 PM (16 years ago)
Author:
kevino@webkit.org
Message:

Windows build fixes for USE(CURL) and MSVC compilation for ports.

Reviewed by Adam Roben.

Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/JavaScriptCore/ChangeLog

    r27993 r27994  
     12007-11-23  Kevin Ollivier  <kevino@theolliviers.com>
     2
     3        MSVC7 build fix. (rand_s doesn't exist there)
     4
     5        Reviewed by Adam Roben.
     6
     7        * kjs/config.h:
     8        * wtf/MathExtras.h:
     9
    1102007-11-23  Kevin Ollivier  <kevino@theolliviers.com>
    211
  • trunk/JavaScriptCore/kjs/config.h

    r27913 r27994  
    4444#define min min
    4545
     46#if !COMPILER(MSVC7)
    4647// We need to define this before the first #include of stdlib.h or it won't contain rand_s.
    4748#define _CRT_RAND_S
     49#endif
    4850
    4951#define HAVE_FLOAT_H 1
  • trunk/JavaScriptCore/wtf/MathExtras.h

    r27614 r27994  
    125125#endif // _CRT_RAND_S
    126126
    127 #else
     127#endif // COMPILER(MSVC)
     128
     129#if !COMPILER(MSVC) || !defined(_CRT_RAND_S)
    128130
    129131// Initializes the random number generator.
  • trunk/WebCore/ChangeLog

    r27993 r27994  
     12007-11-23  Kevin Ollivier  <kevino@theolliviers.com>
     2
     3        Win build fixes. CURL needs winsock, so don't disable it, and
     4        include pthreads.h to get the threadsafe *_r functions.
     5
     6        Reviewed by Adam Roben.
     7
     8        * config.h:
     9        * loader/FTPDirectoryDocument.cpp:
     10        * loader/FTPDirectoryParser.cpp:
     11
    1122007-11-23  Kevin Ollivier  <kevino@theolliviers.com>
    213
  • trunk/WebCore/config.h

    r27928 r27994  
    4646#endif
    4747
     48// CURL needs winsock, so don't prevent inclusion of it
     49#if !USE(CURL)
    4850#ifndef _WINSOCKAPI_
    4951#define _WINSOCKAPI_ // Prevent inclusion of winsock.h in windows.h
     52#endif
    5053#endif
    5154
  • trunk/WebCore/loader/FTPDirectoryDocument.cpp

    r27699 r27994  
    4444#include "XMLTokenizer.h"
    4545
     46// On Win, the threadsafe *_r functions need to be gotten from pthreads.
     47#if COMPILER(MSVC) && USE(PTHREADS)
     48#include <pthread.h>
     49#endif
     50
    4651using namespace std;
    4752
  • trunk/WebCore/loader/FTPDirectoryParser.cpp

    r26676 r27994  
    2424#if ENABLE(FTPDIR)
    2525#include "FTPDirectoryParser.h"
     26
     27// On Win, the threadsafe *_r functions need to be gotten from pthreads.
     28#if COMPILER(MSVC) && USE(PTHREADS)
     29#include <pthread.h>
     30#endif
    2631
    2732#include <wtf/ASCIICType.h>
Note: See TracChangeset for help on using the changeset viewer.