Print this page
5910 libnisdb won't build with modern GCC

Split Close
Expand all
Collapse all
          --- old/usr/src/lib/libnisdb/db_mindex_c.x
          +++ new/usr/src/lib/libnisdb/db_mindex_c.x
↓ open down ↓ 13 lines elided ↑ open up ↑
  14   14   * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  15   15   * If applicable, add the following below this CDDL HEADER, with the
  16   16   * fields enclosed by brackets "[]" replaced with your own identifying
  17   17   * information: Portions Copyright [yyyy] [name of copyright owner]
  18   18   *
  19   19   * CDDL HEADER END
  20   20   */
  21   21  /*
  22   22   *      db_mindex_c.x
  23   23   *
       24 + * Copyright 2015 Gary Mills
  24   25   * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  25   26   * Use is subject to license terms.
  26   27   */
  27   28  
       29 +#if RPC_XDR
       30 +%#include "ldap_xdr.h"
       31 +%#include "nis_clnt.h"
       32 +#endif /* RPC_XDR */
       33 +
  28   34  #if RPC_HDR
  29   35  %#ifndef _DB_MINDEX_H
  30   36  %#define _DB_MINDEX_H
  31   37  
  32   38  #ifdef USINGC
  33   39  %#include "db_vers_c.h"
  34   40  %#include "db_table_c.h"
  35   41  %#include "db_index_entry_c.h"
  36   42  %#include "db_index_c.h"
  37   43  %#include "db_scheme_c.h"
↓ open down ↓ 44 lines elided ↑ open up ↑
  82   88  
  83   89  typedef string  strP<>;
  84   90  
  85   91  struct xdr_nis_object_s {
  86   92          int             xversion;
  87   93          nis_object      *obj;
  88   94          strP            dirEntry<>;
  89   95  };
  90   96  typedef struct xdr_nis_object_s xdr_nis_object_t;
  91   97  
  92      -%extern bool_t  xdr_nis_object();
  93   98  #endif /* USINGC */
  94   99  #endif /* RPC_HDR */
  95  100  
  96  101  #ifndef USINGC
  97  102  #ifdef RPC_HDR
  98  103  %
  99  104  %struct xdr_nis_object_s {
 100  105  %       int                             version;
 101  106  %       nis_object                      *obj;
 102  107  %       struct {
 103  108  %               uint_t  dirEntry_len;
 104  109  %               char    **dirEntry_val;
 105  110  %       }                               dirEntry;
 106  111  %};
 107  112  %typedef struct xdr_nis_object_s        xdr_nis_object_t;
 108  113  %
 109      -%extern bool_t  xdr_nis_object();
 110      -%
 111  114  %class db_mindex {
 112  115  %  vers rversion;
 113  116  %//  int num_indices;
 114  117  %//  db_index * indices;                /* indices[num_indices] */
 115  118  %  struct {
 116  119  %   int indices_len;
 117  120  %   db_index *indices_val;
 118  121  %  } indices;
 119  122  %  db_table *table;
 120  123  %  db_scheme *scheme;
↓ open down ↓ 258 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX