Cleaned up include guards.

src/gcc_atomic.h

@@ -12,8 +12,8 @@
  *    limitations under the License.
  */
 
-#ifndef MSGPACK_GCC_ATOMIC_H__
-#define MSGPACK_GCC_ATOMIC_H__
+#ifndef MSGPACK_GCC_ATOMIC_H
+#define MSGPACK_GCC_ATOMIC_H
 
 #if defined(__cplusplus)
 extern "C" {
@@ -30,4 +30,4 @@ int _msgpack_sync_incr_and_fetch(volatile _msgpack_atomic_counter_t* ptr);
 #endif
 
 
-#endif // MSGPACK_GCC_ATOMIC_H__
+#endif // MSGPACK_GCC_ATOMIC_H

src/msgpack/object.h

@@ -15,8 +15,8 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-#ifndef MSGPACK_OBJECT_H__
-#define MSGPACK_OBJECT_H__
+#ifndef MSGPACK_OBJECT_H
+#define MSGPACK_OBJECT_H
 
 #include "zone.h"
 #include <stdio.h>

src/msgpack/object.hpp

@@ -15,8 +15,8 @@
 //    See the License for the specific language governing permissions and
 //    limitations under the License.
 //
-#ifndef MSGPACK_OBJECT_HPP__
-#define MSGPACK_OBJECT_HPP__
+#ifndef MSGPACK_OBJECT_HPP
+#define MSGPACK_OBJECT_HPP
 
 #include "object.h"
 #include "pack.hpp"

src/msgpack/pack.h

@@ -15,8 +15,8 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-#ifndef MSGPACK_PACK_H__
-#define MSGPACK_PACK_H__
+#ifndef MSGPACK_PACK_H
+#define MSGPACK_PACK_H
 
 #include "pack_define.h"
 #include "object.h"

src/msgpack/pack_define.h

@@ -15,8 +15,8 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-#ifndef MSGPACK_PACK_DEFINE_H__
-#define MSGPACK_PACK_DEFINE_H__
+#ifndef MSGPACK_PACK_DEFINE_H
+#define MSGPACK_PACK_DEFINE_H
 
 #include "msgpack/sysdep.h"
 #include <limits.h>

src/msgpack/sbuffer.h

@@ -15,8 +15,8 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-#ifndef MSGPACK_SBUFFER_H__
-#define MSGPACK_SBUFFER_H__
+#ifndef MSGPACK_SBUFFER_H
+#define MSGPACK_SBUFFER_H
 
 #include <stdlib.h>
 #include <string.h>

src/msgpack/sysdep.h

@@ -15,8 +15,8 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-#ifndef MSGPACK_SYSDEP_H__
-#define MSGPACK_SYSDEP_H__
+#ifndef MSGPACK_SYSDEP_H
+#define MSGPACK_SYSDEP_H
 
 #include <stdlib.h>
 #include <stddef.h>

src/msgpack/type/bool.hpp

@@ -15,8 +15,8 @@
 //    See the License for the specific language governing permissions and
 //    limitations under the License.
 //
-#ifndef MSGPACK_TYPE_BOOL_HPP__
-#define MSGPACK_TYPE_BOOL_HPP__
+#ifndef MSGPACK_TYPE_BOOL_HPP
+#define MSGPACK_TYPE_BOOL_HPP
 
 #include "msgpack/object.hpp"
 #include <vector>

src/msgpack/type/define.hpp.erb

@@ -15,8 +15,8 @@
 //    See the License for the specific language governing permissions and
 //    limitations under the License.
 //
-#ifndef MSGPACK_TYPE_DEFINE_HPP__
-#define MSGPACK_TYPE_DEFINE_HPP__
+#ifndef MSGPACK_TYPE_DEFINE_HPP
+#define MSGPACK_TYPE_DEFINE_HPP
 
 #define MSGPACK_DEFINE(...) \
 	template <typename Packer> \

src/msgpack/type/deque.hpp

@@ -15,8 +15,8 @@
 //    See the License for the specific language governing permissions and
 //    limitations under the License.
 //
-#ifndef MSGPACK_TYPE_DEQUE_HPP__
-#define MSGPACK_TYPE_DEQUE_HPP__
+#ifndef MSGPACK_TYPE_DEQUE_HPP
+#define MSGPACK_TYPE_DEQUE_HPP
 
 #include "msgpack/object.hpp"
 #include <deque>

src/msgpack/type/fixint.hpp

@@ -15,8 +15,8 @@
 //    See the License for the specific language governing permissions and
 //    limitations under the License.
 //
-#ifndef MSGPACK_TYPE_FIXINT_HPP__
-#define MSGPACK_TYPE_FIXINT_HPP__
+#ifndef MSGPACK_TYPE_FIXINT_HPP
+#define MSGPACK_TYPE_FIXINT_HPP
 
 #include "msgpack/object.hpp"
 #include "msgpack/type/int.hpp"

src/msgpack/type/float.hpp

@@ -15,8 +15,8 @@
 //    See the License for the specific language governing permissions and
 //    limitations under the License.
 //
-#ifndef MSGPACK_TYPE_FLOAT_HPP__
-#define MSGPACK_TYPE_FLOAT_HPP__
+#ifndef MSGPACK_TYPE_FLOAT_HPP
+#define MSGPACK_TYPE_FLOAT_HPP
 
 #include "msgpack/object.hpp"
 #include <vector>

src/msgpack/type/int.hpp

@@ -15,8 +15,8 @@
 //    See the License for the specific language governing permissions and
 //    limitations under the License.
 //
-#ifndef MSGPACK_TYPE_INT_HPP__
-#define MSGPACK_TYPE_INT_HPP__
+#ifndef MSGPACK_TYPE_INT_HPP
+#define MSGPACK_TYPE_INT_HPP
 
 #include "msgpack/object.hpp"
 #include <limits>

src/msgpack/type/list.hpp

@@ -15,8 +15,8 @@
 //    See the License for the specific language governing permissions and
 //    limitations under the License.
 //
-#ifndef MSGPACK_TYPE_LIST_HPP__
-#define MSGPACK_TYPE_LIST_HPP__
+#ifndef MSGPACK_TYPE_LIST_HPP
+#define MSGPACK_TYPE_LIST_HPP
 
 #include "msgpack/object.hpp"
 #include <list>

src/msgpack/type/map.hpp

@@ -15,8 +15,8 @@
 //    See the License for the specific language governing permissions and
 //    limitations under the License.
 //
-#ifndef MSGPACK_TYPE_MAP_HPP__
-#define MSGPACK_TYPE_MAP_HPP__
+#ifndef MSGPACK_TYPE_MAP_HPP
+#define MSGPACK_TYPE_MAP_HPP
 
 #include "msgpack/object.hpp"
 #include <map>

src/msgpack/type/nil.hpp

@@ -15,8 +15,8 @@
 //    See the License for the specific language governing permissions and
 //    limitations under the License.
 //
-#ifndef MSGPACK_TYPE_NIL_HPP__
-#define MSGPACK_TYPE_NIL_HPP__
+#ifndef MSGPACK_TYPE_NIL_HPP
+#define MSGPACK_TYPE_NIL_HPP
 
 #include "msgpack/object.hpp"
 

src/msgpack/type/pair.hpp

@@ -15,8 +15,8 @@
 //    See the License for the specific language governing permissions and
 //    limitations under the License.
 //
-#ifndef MSGPACK_TYPE_PAIR_HPP__
-#define MSGPACK_TYPE_PAIR_HPP__
+#ifndef MSGPACK_TYPE_PAIR_HPP
+#define MSGPACK_TYPE_PAIR_HPP
 
 #include "msgpack/object.hpp"
 #include <utility>

src/msgpack/type/raw.hpp

@@ -15,8 +15,8 @@
 //    See the License for the specific language governing permissions and
 //    limitations under the License.
 //
-#ifndef MSGPACK_TYPE_RAW_HPP__
-#define MSGPACK_TYPE_RAW_HPP__
+#ifndef MSGPACK_TYPE_RAW_HPP
+#define MSGPACK_TYPE_RAW_HPP
 
 #include "msgpack/object.hpp"
 #include <string.h>

src/msgpack/type/set.hpp

@@ -15,8 +15,8 @@
 //    See the License for the specific language governing permissions and
 //    limitations under the License.
 //
-#ifndef MSGPACK_TYPE_SET_HPP__
-#define MSGPACK_TYPE_SET_HPP__
+#ifndef MSGPACK_TYPE_SET_HPP
+#define MSGPACK_TYPE_SET_HPP
 
 #include "msgpack/object.hpp"
 #include <set>

src/msgpack/type/string.hpp

@@ -15,8 +15,8 @@
 //    See the License for the specific language governing permissions and
 //    limitations under the License.
 //
-#ifndef MSGPACK_TYPE_STRING_HPP__
-#define MSGPACK_TYPE_STRING_HPP__
+#ifndef MSGPACK_TYPE_STRING_HPP
+#define MSGPACK_TYPE_STRING_HPP
 
 #include "msgpack/object.hpp"
 #include <string>

src/msgpack/type/tr1/unordered_map.hpp

@@ -15,8 +15,8 @@
 //    See the License for the specific language governing permissions and
 //    limitations under the License.
 //
-#ifndef MSGPACK_TYPE_TR1_UNORDERED_MAP_HPP__
-#define MSGPACK_TYPE_TR1_UNORDERED_MAP_HPP__
+#ifndef MSGPACK_TYPE_TR1_UNORDERED_MAP_HPP
+#define MSGPACK_TYPE_TR1_UNORDERED_MAP_HPP
 
 #include "msgpack/object.hpp"
 

src/msgpack/type/tr1/unordered_set.hpp

@@ -15,8 +15,8 @@
 //    See the License for the specific language governing permissions and
 //    limitations under the License.
 //
-#ifndef MSGPACK_TYPE_TR1_UNORDERED_SET_HPP__
-#define MSGPACK_TYPE_TR1_UNORDERED_SET_HPP__
+#ifndef MSGPACK_TYPE_TR1_UNORDERED_SET_HPP
+#define MSGPACK_TYPE_TR1_UNORDERED_SET_HPP
 
 #include "msgpack/object.hpp"
 

src/msgpack/type/tuple.hpp.erb

@@ -15,8 +15,8 @@
 //    See the License for the specific language governing permissions and
 //    limitations under the License.
 //
-#ifndef MSGPACK_TYPE_TUPLE_HPP__
-#define MSGPACK_TYPE_TUPLE_HPP__
+#ifndef MSGPACK_TYPE_TUPLE_HPP
+#define MSGPACK_TYPE_TUPLE_HPP
 
 #include "msgpack/object.hpp"
 

src/msgpack/type/vector.hpp

@@ -15,8 +15,8 @@
 //    See the License for the specific language governing permissions and
 //    limitations under the License.
 //
-#ifndef MSGPACK_TYPE_VECTOR_HPP__
-#define MSGPACK_TYPE_VECTOR_HPP__
+#ifndef MSGPACK_TYPE_VECTOR_HPP
+#define MSGPACK_TYPE_VECTOR_HPP
 
 #include "msgpack/object.hpp"
 #include <vector>

src/msgpack/unpack.h

@@ -15,8 +15,8 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-#ifndef MSGPACK_UNPACKER_H__
-#define MSGPACK_UNPACKER_H__
+#ifndef MSGPACK_UNPACKER_H
+#define MSGPACK_UNPACKER_H
 
 #include "zone.h"
 #include "object.h"

src/msgpack/unpack_define.h

@@ -15,8 +15,8 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-#ifndef MSGPACK_UNPACK_DEFINE_H__
-#define MSGPACK_UNPACK_DEFINE_H__
+#ifndef MSGPACK_UNPACK_DEFINE_H
+#define MSGPACK_UNPACK_DEFINE_H
 
 #include "msgpack/sysdep.h"
 #include <stdlib.h>

src/msgpack/version.h.in

@@ -15,8 +15,8 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-#ifndef MSGPACK_VERSION_H__
-#define MSGPACK_VERSION_H__
+#ifndef MSGPACK_VERSION_H
+#define MSGPACK_VERSION_H
 
 #ifdef __cplusplus
 extern "C" {

src/msgpack/vrefbuffer.h

@@ -15,8 +15,8 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-#ifndef MSGPACK_VREFBUFFER_H__
-#define MSGPACK_VREFBUFFER_H__
+#ifndef MSGPACK_VREFBUFFER_H
+#define MSGPACK_VREFBUFFER_H
 
 #include "zone.h"
 #include <stdlib.h>

src/msgpack/zbuffer.h

@@ -15,8 +15,8 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-#ifndef MSGPACK_ZBUFFER_H__
-#define MSGPACK_ZBUFFER_H__
+#ifndef MSGPACK_ZBUFFER_H
+#define MSGPACK_ZBUFFER_H
 
 #include "sysdep.h"
 #include <stdlib.h>

src/msgpack/zone.h

@@ -15,8 +15,8 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-#ifndef MSGPACK_ZONE_H__
-#define MSGPACK_ZONE_H__
+#ifndef MSGPACK_ZONE_H
+#define MSGPACK_ZONE_H
 
 #include "sysdep.h"