5910 libnisdb won't build with modern GCC

          --- old/usr/src/lib/libnisdb/yptol/shim_lockmap.c
          +++ new/usr/src/lib/libnisdb/yptol/shim_lockmap.c

   1    1  /*
   2    2   * CDDL HEADER START
   3    3   *
   4    4   * The contents of this file are subject to the terms of the
   5    5   * Common Development and Distribution License, Version 1.0 only
   6    6   * (the "License").  You may not use this file except in compliance
   7    7   * with the License.
   8    8   *
   9    9   * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  10   10   * or http://www.opensolaris.org/os/licensing.
  11   11   * See the License for the specific language governing permissions
  12   12   * and limitations under the License.

  13   13   *
  14   14   * When distributing Covered Code, include this CDDL HEADER in each
  15   15   * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  16   16   * If applicable, add the following below this CDDL HEADER, with the
  17   17   * fields enclosed by brackets "[]" replaced with your own identifying
  18   18   * information: Portions Copyright [yyyy] [name of copyright owner]
  19   19   *
  20   20   * CDDL HEADER END
  21   21   */
  22   22  /*
       23 + * Copyright 2015 Gary Mills
  23   24   * Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
  24   25   * Use is subject to license terms.
  25   26   */
  26   27  
  27      -#pragma ident   "%Z%%M% %I%     %E% SMI"
  28      -
  29   28  /*
  30   29   * DESCRIPTION: Contains a front end to the map locking code. These are called
  31   30   *              when a map, or its map_ctrl structure, needs to be locked
  32   31   *              for a short time for internal modification. This lock should
  33   32   *              not be held between DBM operations.
  34   33   *
  35   34   * NOTE :       This is not the same mechanism as the `update lock` which is
  36   35   *              held for a relatively long period when a map is being update
  37   36   *              from the DIT.
  38   37   */
  39   38  
  40   39  #include <unistd.h>
  41   40  #include <syslog.h>
  42   41  #include <sys/mman.h>
  43   42  #include <thread.h>
  44   43  #include <synch.h>
  45   44  #include <ndbm.h>
  46   45  #include "ypsym.h"
  47   46  #include "shim.h"
       47 +#include "stubs.h"
  48   48  
  49   49  /*
  50   50   * FUNCTION :   lock_map_ctrl()
  51   51   *
  52   52   * DESCRIPTION: Front end to the lock routine taking map_ctrl structure as
  53   53   *              argument. Saves cost of a hash operation.
  54   54   *
  55   55   * GIVEN :      Map_ctrl structure .
  56   56   *
  57   57   * RETURNS :    Same as lock core

  58   58   */
  59   59  int
  60   60  lock_map_ctrl(map_ctrl *map)
  61   61  {
  62   62          int ret;
  63   63  
  64   64          ret = lock_core(map->hash_val);
  65   65  
  66   66          return (ret);
  67   67  }
  68   68  
  69   69  /*
  70   70   * FUNCTION :   unlock_map_ctrl()
  71   71   *
  72   72   * DESCRIPTION: Front end to the unlock routine taking map_ctrl structure as
  73   73   *              argument. Saves cost of a hash operation.
  74   74   *
  75   75   * GIVEN :      Map_ctrl structure .
  76   76   *
  77   77   * RETURNS :    Same as lock core
  78   78   */
  79   79  int
  80   80  unlock_map_ctrl(map_ctrl *map)
  81   81  {
  82   82          int ret;
  83   83  
  84   84          ret = unlock_core(map->hash_val);
  85   85          return (ret);
  86   86  }

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX