[aseprite] 19/196: Move stdints to base/ints.h file

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit 9a7ffab5a00dcdf55933ce3033b54c0fd6e89b0c
Author: David Capello <davidcapello at gmail.com>
Date:   Thu Mar 3 19:20:00 2016 -0300

    Move stdints to base/ints.h file
---
 src/app/context_flags.h  |  4 +++-
 src/base/base.h          |  6 +-----
 src/base/ints.h          | 19 +++++++++++++++++++
 src/base/process.h       |  4 +++-
 src/base/serialization.h |  3 ++-
 src/base/sha1_rfc3174.c  |  3 ++-
 src/doc/color.h          |  4 +++-
 src/doc/object_id.h      |  4 +++-
 src/fixmath/fixmath.h    |  1 +
 src/gfx/color.h          |  4 +++-
 10 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/src/app/context_flags.h b/src/app/context_flags.h
index c667091..42af34b 100644
--- a/src/app/context_flags.h
+++ b/src/app/context_flags.h
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2016  David Capello
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 2 as
@@ -9,6 +9,8 @@
 #define APP_CONTEXT_FLAGS_H_INCLUDED
 #pragma once
 
+#include "base/ints.h"
+
 namespace doc {
   class Site;
 }
diff --git a/src/base/base.h b/src/base/base.h
index 7bb78c8..b2773aa 100644
--- a/src/base/base.h
+++ b/src/base/base.h
@@ -1,5 +1,5 @@
 // Aseprite Base Library
-// Copyright (c) 2001-2015 David Capello
+// Copyright (c) 2001-2016 David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -12,10 +12,6 @@
 
 #include <math.h>
 
-#ifdef HAVE_STDINT_H
-  #include <stdint.h>
-#endif
-
 #undef NULL
 #ifdef __cplusplus
   #define NULL nullptr
diff --git a/src/base/ints.h b/src/base/ints.h
new file mode 100644
index 0000000..800efa8
--- /dev/null
+++ b/src/base/ints.h
@@ -0,0 +1,19 @@
+// Aseprite Base Library
+// Copyright (c) 2016 David Capello
+//
+// This file is released under the terms of the MIT license.
+// Read LICENSE.txt for more information.
+
+#ifndef BASE_INTS_H_INCLUDED
+#define BASE_INTS_H_INCLUDED
+#pragma once
+
+#include "base/config.h"
+
+#ifdef HAVE_STDINT_H
+  #include <stdint.h>
+#else
+  #error uint8_t, uint32_t, etc. definitions are missing
+#endif
+
+#endif
diff --git a/src/base/process.h b/src/base/process.h
index 95776b5..1f26957 100644
--- a/src/base/process.h
+++ b/src/base/process.h
@@ -1,5 +1,5 @@
 // Aseprite Base Library
-// Copyright (c) 2015 David Capello
+// Copyright (c) 2015-2016 David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -8,6 +8,8 @@
 #define BASE_PROCESS_H_INCLUDED
 #pragma once
 
+#include "base/ints.h"
+
 namespace base {
 
   typedef uint32_t pid;
diff --git a/src/base/serialization.h b/src/base/serialization.h
index 1e75eba..1ffb3aa 100644
--- a/src/base/serialization.h
+++ b/src/base/serialization.h
@@ -1,5 +1,5 @@
 // Aseprite Base Library
-// Copyright (c) 2001-2013 David Capello
+// Copyright (c) 2001-2016 David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -8,6 +8,7 @@
 #define BASE_SERIALIZATION_H_INCLUDED
 #pragma once
 
+#include "base/ints.h"
 #include <iosfwd>
 
 namespace base {
diff --git a/src/base/sha1_rfc3174.c b/src/base/sha1_rfc3174.c
index 518814f..f529d88 100644
--- a/src/base/sha1_rfc3174.c
+++ b/src/base/sha1_rfc3174.c
@@ -32,7 +32,8 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include "sha1_rfc3174.h"
+#include "base/ints.h"
+#include "base/sha1_rfc3174.h"
 
 /*
  *  Define the SHA1 circular left shift macro
diff --git a/src/doc/color.h b/src/doc/color.h
index 53634de..98cb187 100644
--- a/src/doc/color.h
+++ b/src/doc/color.h
@@ -1,5 +1,5 @@
 // Aseprite Document Library
-// Copyright (c) 2001-2015 David Capello
+// Copyright (c) 2001-2016 David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -8,6 +8,8 @@
 #define DOC_COLOR_H_INCLUDED
 #pragma once
 
+#include "base/ints.h"
+
 namespace doc {
 
   // The greatest int type to storage a color for an image in the
diff --git a/src/doc/object_id.h b/src/doc/object_id.h
index f2d3fbf..285da2d 100644
--- a/src/doc/object_id.h
+++ b/src/doc/object_id.h
@@ -1,5 +1,5 @@
 // Aseprite Document Library
-// Copyright (c) 2001-2014 David Capello
+// Copyright (c) 2001-2016 David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -8,6 +8,8 @@
 #define DOC_OBJECT_ID_H_INCLUDED
 #pragma once
 
+#include "base/ints.h"
+
 namespace doc {
 
   typedef uint32_t ObjectId;
diff --git a/src/fixmath/fixmath.h b/src/fixmath/fixmath.h
index bcb7c2a..6649069 100644
--- a/src/fixmath/fixmath.h
+++ b/src/fixmath/fixmath.h
@@ -6,6 +6,7 @@
 #ifndef FIXMATH_FIXMATH_H
 #define FIXMATH_FIXMATH_H
 
+#include "base/ints.h"
 #include <cerrno>
 
 namespace fixmath {
diff --git a/src/gfx/color.h b/src/gfx/color.h
index c541d12..f58f70b 100644
--- a/src/gfx/color.h
+++ b/src/gfx/color.h
@@ -1,5 +1,5 @@
 // Aseprite Gfx Library
-// Copyright (C) 2001-2015 David Capello
+// Copyright (C) 2001-2016 David Capello
 //
 // This file is released under the terms of the MIT license.
 // Read LICENSE.txt for more information.
@@ -8,6 +8,8 @@
 #define GFX_COLOR_H_INCLUDED
 #pragma once
 
+#include "base/ints.h"
+
 namespace gfx {
 
   typedef uint32_t Color;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git