From fa546abe9d0346d5d87b8fe19884993408476d77 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 16 May 2009 10:29:43 -0700 Subject: 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. --- ChangeLog | 3 --- nscd/nscd-client.h | 5 ----- nscd/nscd.h | 5 +++++ 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 879b28586e..8d94a78b8c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,9 +5,6 @@ 2009-05-15 Ulrich Drepper - * 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 81ca3d56b9..c6c09cbddd 100644 --- 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 632bf58dc5..3279b85432 100644 --- 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) -- cgit v1.2.3-70-g09d2