Changeset 740 for vendor/current/source4/include

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/source4/include/includes.h (modified) (3 diffs)

vendor/current/source4/include/includes.h

@@ -33 +33 @@
 #include "system/time.h"
 #include "system/wait.h"
+#include "system/locale.h"
 
 /* only do the C++ reserved word check when we compile
@@ -38 +39 @@
    still have comflicts with their header files (e.g. IRIX 6.4) */
 
-#if !defined(__cplusplus) && defined(DEVELOPER)
+#if !defined(__cplusplus) && defined(DEVELOPER) && defined(__linux__)
 #define class #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
 #define private #error DONT_USE_CPLUSPLUS_RESERVED_NAMES
@@ -69 +70 @@
 #include "../lib/util/smb_threads_internal.h"
 
-#if defined(UID_WRAPPER)
-#if !defined(UID_WRAPPER_REPLACE) && !defined(UID_WRAPPER_NOT_REPLACE)
-#define UID_WRAPPER_REPLACE
-#include "../uid_wrapper/uid_wrapper.h"
-#endif
-#else
-#define uwrap_enabled() 0
-#endif
-
 #endif /* _INCLUDES_H */