Skip to content

Commit

Permalink
Revert "nbody.cu: move includes to common location"
Browse files Browse the repository at this point in the history
This reverts commit 86b50e3.

The change broke MSVC builds for example, because the includes were in the
wrong side of the #ifdef...

Signed-off-by: Steven Noonan <steven@uplinklabs.net>
  • Loading branch information
tycho committed Mar 19, 2016
1 parent 036dabc commit f94cb33
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions src/nbody.cu
Original file line number Diff line number Diff line change
Expand Up @@ -61,16 +61,6 @@
#include <fcntl.h>
#include <sys/select.h>

#include <math.h>

#include "libtime.h"

#include "chThread.h"
#include "chError.h"

#include "nbody.h"
#include "nbody_util.h"

static int kbhit(void)
{
struct termios oldt, newt;
Expand Down Expand Up @@ -108,6 +98,16 @@ getch(void)

#endif

#include <math.h>

#include "libtime.h"

#include "chThread.h"
#include "chError.h"

#include "nbody.h"
#include "nbody_util.h"

enum nbodyAlgorithm_enum {
CPU_AOS = 0, /* This is the golden implementation */
CPU_AOS_tiled,
Expand Down

0 comments on commit f94cb33

Please sign in to comment.