Unverified Commit 6369ab23 authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

make inclusion guard defines consistent with LAMMPS and avoid redefinition of MAX()

parent 9fade740
Loading
Loading
Loading
Loading
+4 −3
Original line number Diff line number Diff line
@@ -13,13 +13,14 @@

#include "kokkos_type.h"


#ifndef MAX
#define MAX(A,B) ((A) > (B) ? (A) : (B))
#endif

// data types for 2d/3d FFTs

#ifndef FFT_DATA_KOKKOS_H
#define FFT_DATA_KOKKOS_H
#ifndef LMP_FFT_DATA_KOKKOS_H
#define LMP_FFT_DATA_KOKKOS_H

// User-settable FFT precision

+2 −2
Original line number Diff line number Diff line
@@ -11,8 +11,8 @@
   See the README file in the top-level LAMMPS directory.
------------------------------------------------------------------------- */

#ifndef KOKKOS_BASE_FFT_H
#define KOKKOS_BASE_FFT_H
#ifndef LMP_KOKKOS_BASE_FFT_H
#define LMP_KOKKOS_BASE_FFT_H

#include "fftdata_kokkos.h"