[llvm-commits] [llvm] r74835 *AND* r74846 - /llvm/trunk/lib/System/Threading.cpp

[Xerxes Rånby]

Thank you Chris and Owen for both applying my patch...

the funny thing are that Chris have applied a "new variant" of the patch
that added the config.h at the bottom while Owen applied the patch as is
and thus added the config.h at the top.
Basically now we have one config.h extra in Threading.cpp

Chris would you mind if we back out your reverse-alphabetic version with
the removed newline out?

Cheers
Xerxes


Den 2009-07-06 19:25, Chris Lattner skrev:
> Author: lattner
> Date: Mon Jul  6 12:24:48 2009
> New Revision: 74835
>
> URL: http://llvm.org/viewvc/llvm-project?rev=74835&view=rev
> Log:
> improve portability to windows, patch by Xerces Ranby!
>
> Modified:
>     llvm/trunk/lib/System/Threading.cpp
>
> Modified: llvm/trunk/lib/System/Threading.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/System/Threading.cpp?rev=74835&r1=74834&r2=74835&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/System/Threading.cpp (original)
> +++ llvm/trunk/lib/System/Threading.cpp Mon Jul  6 12:24:48 2009
> @@ -14,8 +14,8 @@
>  #include "llvm/System/Threading.h"
>  #include "llvm/System/Atomic.h"
>  #include "llvm/System/Mutex.h"
> +#include "llvm/Config/config.h"
>  #include <cassert>
> -
>  using namespace llvm;
>  
>  static bool multithreaded_mode = false;
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>   

Den 2009-07-06 20:50, Owen Anderson skrev:
> Author: resistor
> Date: Mon Jul  6 13:50:47 2009
> New Revision: 74846
>
> URL: http://llvm.org/viewvc/llvm-project?rev=74846&view=rev
> Log:
> We need to include config.h to get the proper setting to LLVM_MULTITHREADED.
>
> Patch by Xerxes Ranby.
>
> Modified:
>     llvm/trunk/lib/System/Threading.cpp
>
> Modified: llvm/trunk/lib/System/Threading.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/System/Threading.cpp?rev=74846&r1=74845&r2=74846&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/System/Threading.cpp (original)
> +++ llvm/trunk/lib/System/Threading.cpp Mon Jul  6 13:50:47 2009
> @@ -11,6 +11,7 @@
>  //
>  //===----------------------------------------------------------------------===//
>  
> +#include "llvm/Config/config.h"
>  #include "llvm/System/Threading.h"
>  #include "llvm/System/Atomic.h"
>  #include "llvm/System/Mutex.h"
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>