summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
Diffstat (limited to 'util')
-rw-r--r--util/merge_dir.c5
-rw-r--r--util/shmctl.c2
2 files changed, 4 insertions, 3 deletions
diff --git a/util/merge_dir.c b/util/merge_dir.c
index 44fcd1f2..2b2fd85b 100644
--- a/util/merge_dir.c
+++ b/util/merge_dir.c
@@ -9,9 +9,10 @@ void usage() {
fileheader_t *fh;
-int dir_cmp(fileheader_t *a, fileheader_t *b)
+int dir_cmp(const void *a, const void *b)
{
- return strncasecmp(a->filename, b->filename, 12);
+ return strncasecmp(((fileheader_t *)a)->filename,
+ ((fileheader_t *)b)->filename, 12);
}
int main(int argc, char **argv) {
diff --git a/util/shmctl.c b/util/shmctl.c
index 8b30c758..82778162 100644
--- a/util/shmctl.c
+++ b/util/shmctl.c
@@ -210,7 +210,6 @@ inline void utmpsort(int sortall)
userinfo_t *uentp;
int count, i, ns;
short nusers[MAX_BOARD];
- boardheader_t *HBcache[HOTBOARDCACHE];
SHM->UTMPbusystate = 1;
@@ -265,6 +264,7 @@ inline void utmpsort(int sortall)
{
#if HOTBOARDCACHE
int k, r, last = 0, top = 0;
+ boardheader_t *HBcache[HOTBOARDCACHE];
#endif
for (i = 0; i < SHM->Bnumber; ++i)
if (SHM->bcache[i].brdname[0] != 0){