big fat commit..

[chaz/openbox] / src / xatom.cc

diff --git a/src/xatom.cc b/src/xatom.cc
index 59e8b164e9c43c4dc47423bca08e9007ff7882e3..5561503adf8d97cc0992a1daad7cbcc112872b8c 100644 (file)
--- a/src/xatom.cc
+++ b/src/xatom.cc
@@ -1,27 +1,14 @@
-// XAtom.cc for Openbox
-// Copyright (c) 2002 - 2002 Ben Jansens (xor at orodu.net)
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 
 #include "../config.h"
 
+#ifdef    HAVE_CONFIG_H
+#  include "../config.h"
+#endif // HAVE_CONFIG_H
+
+extern "C" {
 #include <assert.h>
+}
 
 #include "xatom.hh"
 #include "screen.hh"