aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Benjamin Barenblat <bbaren@mit.edu>2016-02-20 13:48:18 -0500
committerGravatar Benjamin Barenblat <bbaren@mit.edu>2016-02-20 13:58:20 -0500
commit251c10fd882038d4b2461bda2f8fc279d856a7cc (patch)
tree3800fe46bb4879bb75e2bebf3fe25671a7b48cc1 /src
parent28a87f4a6532304b2ede31998b03fbad740f4fa3 (diff)
Only define FUSE_USE_VERSION once
Diffstat (limited to 'src')
-rw-r--r--src/fuse.h21
-rw-r--r--src/operations.cc3
-rw-r--r--src/operations.h4
-rw-r--r--src/scoville.cc3
4 files changed, 24 insertions, 7 deletions
diff --git a/src/fuse.h b/src/fuse.h
new file mode 100644
index 0000000..f7d012f
--- /dev/null
+++ b/src/fuse.h
@@ -0,0 +1,21 @@
+// Copyright 2016 Benjamin Barenblat
+//
+// Licensed under the Apache License, Version 2.0 (the "License"); you may not
+// use this file except in compliance with the License. You may obtain a copy
+// of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations under
+// the License.
+
+#ifndef FUSE_H_
+#define FUSE_H_
+
+#define FUSE_USE_VERSION 26
+#include <fuse/fuse.h>
+
+#endif // FUSE_H_
diff --git a/src/operations.cc b/src/operations.cc
index 326f2a5..021f447 100644
--- a/src/operations.cc
+++ b/src/operations.cc
@@ -25,13 +25,12 @@
#include <new>
#include <type_traits>
-#define FUSE_USE_VERSION 26
#include <dirent.h>
-#include <fuse.h>
#include <glog/logging.h>
#include <sys/stat.h>
#include <sys/types.h>
+#include "fuse.h"
#include "posix_extras.h"
namespace scoville {
diff --git a/src/operations.h b/src/operations.h
index 9b0f0f1..33e0767 100644
--- a/src/operations.h
+++ b/src/operations.h
@@ -15,9 +15,7 @@
#ifndef OPERATIONS_H_
#define OPERATIONS_H_
-#define FUSE_USE_VERSION 26
-#include <fuse.h>
-
+#include "fuse.h"
#include "posix_extras.h"
namespace scoville {
diff --git a/src/scoville.cc b/src/scoville.cc
index 78a29ae..4cc563d 100644
--- a/src/scoville.cc
+++ b/src/scoville.cc
@@ -16,12 +16,11 @@
#include <memory>
-#define FUSE_USE_VERSION 26
#include <fcntl.h>
-#include <fuse/fuse.h>
#include <gflags/gflags.h>
#include <glog/logging.h>
+#include "fuse.h"
#include "operations.h"
#include "posix_extras.h"