Move BLOCK_ALIGN* macros back.

The move to nscd-client.h was only needed for some interim version
of the patch.  The final version doesn't need it.  Undo the change.

diff --git a/ChangeLog b/ChangeLog
index 879b285..8d94a78 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,9 +5,6 @@
 
 2009-05-15  Ulrich Drepper  <drepper@redhat.com>
 
-       * nscd/nscd.h: Move Definition for BLOCK_ALIGN_LOG, BLOCK_ALIGN, and
-       BLOCK_ALIGN_M1 to ...
-       * nscd/nscd-client.h: ...here.
        * nscd/nscd_helper.c (__nscd_cache_search): Introduce loop counter.
        Use it if we absolutely cannot reach any more correct list elements
        because that many do not fit into the currently mapped database.

diff --git a/nscd/nscd-client.h b/nscd/nscd-client.h
index 81ca3d5..c6c09cb 100644 (file)
--- a/nscd/nscd-client.h
+++ b/nscd/nscd-client.h
@@ -47,11 +47,6 @@
 /* Maximum allowed length for the key.  */
 #define MAXKEYLEN 1024
 
-/* Maximum alignment requirement we will encounter.  */
-#define BLOCK_ALIGN_LOG 3
-#define BLOCK_ALIGN (1 << BLOCK_ALIGN_LOG)
-#define BLOCK_ALIGN_M1 (BLOCK_ALIGN - 1)
-
 
 /* Available services.  */
 typedef enum

diff --git a/nscd/nscd.h b/nscd/nscd.h
index 632bf58..3279b85 100644 (file)
--- a/nscd/nscd.h
+++ b/nscd/nscd.h
@@ -111,6 +111,11 @@ struct database_dyn
 /* Path used when not using persistent storage.  */
 #define _PATH_NSCD_XYZ_DB_TMP  "/var/run/nscd/dbXXXXXX"
 
+/* Maximum alignment requirement we will encounter.  */
+#define BLOCK_ALIGN_LOG 3
+#define BLOCK_ALIGN (1 << BLOCK_ALIGN_LOG)
+#define BLOCK_ALIGN_M1 (BLOCK_ALIGN - 1)
+
 /* Default value for the maximum size of the database files.  */
 #define DEFAULT_MAX_DB_SIZE    (32 * 1024 * 1024)