mesa: move CEILING() macro into macros.h

Reviewed-by: Eric Anholt <eric@anholt.net>

diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c
index 3b16d3d443bc99dea8459ad12d6409b863225fd0..3a6f01c57c25a58f04595703202526440504c454 100644 (file)
--- a/src/mesa/main/image.c
+++ b/src/mesa/main/image.c
@@ -55,9 +55,6 @@
 
 
 
-/** Compute ceiling of integer quotient of A divided by B. */
-#define CEILING( A, B )  ( (A) % (B) == 0 ? (A)/(B) : (A)/(B)+1 )
-
 
 /**
  * \return GL_TRUE if type is packed pixel type, GL_FALSE otherwise.

diff --git a/src/mesa/main/macros.h b/src/mesa/main/macros.h
index d90905f997e120869d493dc513af95c726155763..029f609fd938e02bde494e97d3e66a179ec45d4d 100644 (file)
--- a/src/mesa/main/macros.h
+++ b/src/mesa/main/macros.h
@@ -662,6 +662,10 @@ do {                        \
 #define LEN_SQUARED_2FV( V ) ((V)[0]*(V)[0]+(V)[1]*(V)[1])
 
 
+/** Compute ceiling of integer quotient of A divided by B. */
+#define CEILING( A, B )  ( (A) % (B) == 0 ? (A)/(B) : (A)/(B)+1 )
+
+
 /** casts to silence warnings with some compilers */
 #define ENUM_TO_INT(E)     ((GLint)(E))
 #define ENUM_TO_FLOAT(E)   ((GLfloat)(GLint)(E))

diff --git a/src/mesa/main/pack.c b/src/mesa/main/pack.c
index de29395b0fea852af3063401c7c9a3ba512ce499..a3cfb59f257408c0ba6aece6b9c4447e58b67e72 100644 (file)
--- a/src/mesa/main/pack.c
+++ b/src/mesa/main/pack.c
@@ -34,6 +34,7 @@
 #include "enums.h"
 #include "image.h"
 #include "imports.h"
+#include "macros.h"
 #include "mtypes.h"
 #include "pack.h"
 #include "pixeltransfer.h"
@@ -58,10 +59,6 @@
 
 
 
-/** Compute ceiling of integer quotient of A divided by B. */
-#define CEILING( A, B )  ( (A) % (B) == 0 ? (A)/(B) : (A)/(B)+1 )
-
-
 /**
  * Flip the 8 bits in each byte of the given array.
  *