diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp | 3 | ||||
| -rw-r--r-- | lib/Support/APFloat.cpp | 2 | ||||
| -rw-r--r-- | lib/System/Win32/Alarm.inc | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp index 47335d3f9a..6139638dab 100644 --- a/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp +++ b/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp @@ -4718,8 +4718,9 @@ isAllocatableRegister(unsigned Reg, MachineFunction &MF, namespace llvm { /// AsmOperandInfo - This contains information for each constraint that we are /// lowering. -struct VISIBILITY_HIDDEN SDISelAsmOperandInfo : +class VISIBILITY_HIDDEN SDISelAsmOperandInfo : public TargetLowering::AsmOperandInfo { +public: /// CallOperand - If this is the result output operand or a clobber /// this is null, otherwise it is the incoming operand to the CallInst. /// This gets modified as the asm is processed. diff --git a/lib/Support/APFloat.cpp b/lib/Support/APFloat.cpp index d8d414d7ea..e7be299f30 100644 --- a/lib/Support/APFloat.cpp +++ b/lib/Support/APFloat.cpp @@ -1239,7 +1239,7 @@ APFloat::addOrSubtractSpecials(const APFloat &rhs, bool subtract) case convolve(fcInfinity, fcInfinity): /* Differently signed infinities can only be validly subtracted. */ - if((sign ^ rhs.sign) != subtract) { + if(((sign ^ rhs.sign)!=0) != subtract) { makeNaN(); return opInvalidOp; } diff --git a/lib/System/Win32/Alarm.inc b/lib/System/Win32/Alarm.inc index dca9e08171..c413b096e7 100644 --- a/lib/System/Win32/Alarm.inc +++ b/lib/System/Win32/Alarm.inc @@ -36,7 +36,7 @@ int sys::AlarmStatus() { } // Don't pull in all of the Windows headers. -extern "C" _stdcall void Sleep(unsigned long); +extern "C" void __stdcall Sleep(unsigned long); void sys::Sleep(unsigned n) { Sleep(n*1000); |