1575 untangle libmlrpc ... (libmlrpc)

*** 16,32 ****
   * fields enclosed by brackets "[]" replaced with your own identifying
   * information: Portions Copyright [yyyy] [name of copyright owner]
   *
   * CDDL HEADER END
   */
  /*
   * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
   * Use is subject to license terms.
   */
  
! #ifndef _SMBSRV_WINTYPES_H
! #define _SMBSRV_WINTYPES_H
  
  #include <sys/types.h>
  
  /*
   * Standard win32 types and definitions.
--- 16,35 ----
   * fields enclosed by brackets "[]" replaced with your own identifying
   * information: Portions Copyright [yyyy] [name of copyright owner]
   *
   * CDDL HEADER END
   */
+ 
  /*
   * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
   * Use is subject to license terms.
+  *
+  * Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
   */
  
! #ifndef _SMB_WINTYPES_H
! #define _SMB_WINTYPES_H
  
  #include <sys/types.h>
  
  /*
   * Standard win32 types and definitions.
*** 40,77 ****
  #define UNSIGNED_TYPES_DEFINED
  
  typedef uint8_t BYTE;
  typedef uint16_t WORD;
  typedef uint32_t DWORD;
! typedef uint32_t ntstatus_t;
  typedef uint8_t *LPTSTR;
- typedef uint8_t *LPBYTE;
- typedef uint16_t *LPWORD;
- typedef uint32_t *LPDWORD;
  
  #endif /* UNSIGNED_TYPES_DEFINED */
  
  
  #ifndef ANY_SIZE_ARRAY
  #define ANY_SIZE_ARRAY  1
  #endif /* ANY_SIZE_ARRAY */
  
! /*
!  * Opaque context handle.
!  */
! #ifndef CONTEXT_HANDLE
! #define CONTEXT_HANDLE(NAME)    \
!         struct NAME {           \
!                 DWORD data1;    \
!                 DWORD data2;    \
!                 WORD  data3[2]; \
!                 BYTE  data4[8]; \
!         };                      \
!         typedef struct NAME
! #endif /* CONTEXT_HANDLE */
  
- 
  #ifdef __cplusplus
  }
  #endif
  
! #endif /* _SMBSRV_WINTYPES_H */
--- 43,72 ----
  #define UNSIGNED_TYPES_DEFINED
  
  typedef uint8_t BYTE;
  typedef uint16_t WORD;
  typedef uint32_t DWORD;
! typedef DWORD ntstatus_t;
! 
! /* pointers to those types */
! typedef BYTE *LPBYTE;
! typedef WORD *LPWORD;
! typedef DWORD *LPDWORD;
! 
! /* Note: Internally, this is always a UTF-8 string. */
  typedef uint8_t *LPTSTR;
  
  #endif /* UNSIGNED_TYPES_DEFINED */
  
  
+ /* XXX This does not really belong here... */
  #ifndef ANY_SIZE_ARRAY
  #define ANY_SIZE_ARRAY  1
  #endif /* ANY_SIZE_ARRAY */
  
! /* CONTEXT_HANDLE now in ndrtypes.ndl */
  
  #ifdef __cplusplus
  }
  #endif
  
! #endif /* _SMB_WINTYPES_H */