← Back to branch summary

~ubuntu-branches/ubuntu/trusty/qtscript-opensource-src/trusty

« back to all changes in this revision

Viewing changes to src/3rdparty/javascriptcore/JavaScriptCore/config.h

  • Committer: Package Import Robot
  • Author(s): Timo Jyrinki
  • Date: 2014-03-10 14:30:51 UTC
  • mfrom: (1.1.4) (5.1.2 experimental)
  • Revision ID: package-import@ubuntu.com-20140310143051-6rr67kxeqic3zern
Tags: 5.2.1+dfsg-1ubuntu1
* debian/patches/aarch64.patch
  - Needed to fix arm64 FTBFS

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/3rdparty/javascriptcore/JavaScriptCore/config.h
39
39
 
40
40
#if OS(WINDOWS)
41
41
 
42
 
// If we don't define these, they get defined in windef.h. 
43
 
// We want to use std::min and std::max
44
 
#define max max
45
 
#define min min
 
42
// windef.h defines min and max unless NOMINMAX is defined.
 
43
#ifndef NOMINMAX
 
44
#  define NOMINMAX
 
45
#endif
46
46
 
47
47
#if !COMPILER(MSVC7) && !OS(WINCE)
48
48
// We need to define this before the first #include of stdlib.h or it won't contain rand_s.