From: Sage Weil <sage@newdream.net>
Date: Wed, 2 Nov 2011 15:45:36 +0000 (-0700)
Subject: Merge branch 'wip-freebsd'
X-Git-Tag: v0.39~170
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=78111d079be2bb4cde1bed1e772d53061c5c3986;p=ceph.git

Merge branch 'wip-freebsd'

Conflicts:
	src/osd/OSD.cc
---

78111d079be2bb4cde1bed1e772d53061c5c3986
diff --cc src/osd/OSD.cc
index f52566e33b59,202965ee0e75..b68f1a46354e
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@@ -12,17 -12,6 +12,17 @@@
   * 
   */
  
 +#include <fstream>
 +#include <iostream>
 +#include <errno.h>
 +#include <sys/stat.h>
 +#include <signal.h>
 +#include <boost/scoped_ptr.hpp>
 +
- #ifdef DARWIN
++#if defined(DARWIN) || defined(__FreeBSD__)
 +#include <sys/param.h>
 +#include <sys/mount.h>
- #endif // DARWIN
++#endif // DARWIN || __FreeBSD__
  
  #include "osd/PG.h"