Ignore:
Timestamp:
Nov 27, 2012, 4:43:17 PM (13 years ago)
Author:
Silvan Scherrer
Message:

Samba Server: updated trunk to 3.6.0

Location:
trunk/server
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/server

  • trunk/server/nsswitch/winbind_nss_solaris.h

    r414 r745  
    2323#define _WINBIND_NSS_SOLARIS_H
    2424
    25 /* Solaris has a broken nss_common header file containing C++ reserved names. */
    26 #ifndef __cplusplus
    27 #undef class
    28 #undef private
    29 #undef public
    30 #undef protected
    31 #undef template
    32 #undef this
    33 #undef new
    34 #undef delete
    35 #undef friend
    36 #endif
    37 
    3825#include <nss_common.h>
    39 
    40 #ifndef __cplusplus
    41 #define class #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
    42 #define private #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
    43 #define public #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
    44 #define protected #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
    45 #define template #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
    46 #define this #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
    47 #define new #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
    48 #define delete #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
    49 #define friend #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
    50 #endif
    51 
    5226#include <nss_dbdefs.h>
    5327#include <nsswitch.h>
Note: See TracChangeset for help on using the changeset viewer.