1575 untangle libmlrpc ... (libmlrpc)

          --- old/usr/src/uts/common/smbsrv/wintypes.h
          +++ new/usr/src/uts/common/smb/wintypes.h

   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 (the "License").
   6    6   * You may not use this file except in compliance with the License.
   7    7   *
   8    8   * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
   9    9   * or http://www.opensolaris.org/os/licensing.
  10   10   * See the License for the specific language governing permissions

  11   11   * and limitations under the License.
  12   12   *
  13   13   * When distributing Covered Code, include this CDDL HEADER in each
  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   23   * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  23   24   * Use is subject to license terms.
       25 + *
       26 + * Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
  24   27   */
  25   28  
  26      -#ifndef _SMBSRV_WINTYPES_H
  27      -#define _SMBSRV_WINTYPES_H
       29 +#ifndef _SMB_WINTYPES_H
       30 +#define _SMB_WINTYPES_H
  28   31  
  29   32  #include <sys/types.h>
  30   33  
  31   34  /*
  32   35   * Standard win32 types and definitions.
  33   36   */
  34   37  
  35   38  #ifdef __cplusplus
  36   39  extern "C" {
  37   40  #endif
  38   41  
  39   42  #ifndef UNSIGNED_TYPES_DEFINED
  40   43  #define UNSIGNED_TYPES_DEFINED
  41   44  
  42   45  typedef uint8_t BYTE;
  43   46  typedef uint16_t WORD;
  44   47  typedef uint32_t DWORD;
  45      -typedef uint32_t ntstatus_t;
       48 +typedef DWORD ntstatus_t;
       49 +
       50 +/* pointers to those types */
       51 +typedef BYTE *LPBYTE;
       52 +typedef WORD *LPWORD;
       53 +typedef DWORD *LPDWORD;
       54 +
       55 +/* Note: Internally, this is always a UTF-8 string. */
  46   56  typedef uint8_t *LPTSTR;
  47      -typedef uint8_t *LPBYTE;
  48      -typedef uint16_t *LPWORD;
  49      -typedef uint32_t *LPDWORD;
  50   57  
  51   58  #endif /* UNSIGNED_TYPES_DEFINED */
  52   59  
  53   60  
       61 +/* XXX This does not really belong here... */
  54   62  #ifndef ANY_SIZE_ARRAY
  55   63  #define ANY_SIZE_ARRAY  1
  56   64  #endif /* ANY_SIZE_ARRAY */
  57   65  
  58      -/*
  59      - * Opaque context handle.
  60      - */
  61      -#ifndef CONTEXT_HANDLE
  62      -#define CONTEXT_HANDLE(NAME)    \
  63      -        struct NAME {           \
  64      -                DWORD data1;    \
  65      -                DWORD data2;    \
  66      -                WORD  data3[2]; \
  67      -                BYTE  data4[8]; \
  68      -        };                      \
  69      -        typedef struct NAME
  70      -#endif /* CONTEXT_HANDLE */
       66 +/* CONTEXT_HANDLE now in ndrtypes.ndl */
  71   67  
  72      -
  73   68  #ifdef __cplusplus
  74   69  }
  75   70  #endif
  76   71  
  77      -#endif /* _SMBSRV_WINTYPES_H */
       72 +#endif /* _SMB_WINTYPES_H */
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX