[SCM] Samba Shared Repository - branch master updated

[Andrew Tridgell]

The branch, master has been updated
       via  08a0096... s4-idl: don't call a variable 'stat'
      from  f49818e... lib-util: check for too many combinations in generate_unique_strs()

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 08a0096ab6e81d4a1abac636c1762d3f5d0dfc8a
Author: Andrew Tridgell <tridge at samba.org>
Date:   Tue Oct 20 12:13:15 2009 +1100

    s4-idl: don't call a variable 'stat'
    
    never call a structure member by the name of a standard C lib call. It
    breaks the build on some systems.

-----------------------------------------------------------------------

Summary of changes:
 source4/librpc/idl/winsif.idl |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/librpc/idl/winsif.idl b/source4/librpc/idl/winsif.idl
index 380f3cb..a9bf554 100644
--- a/source4/librpc/idl/winsif.idl
+++ b/source4/librpc/idl/winsif.idl
@@ -129,7 +129,7 @@ import "nbt.idl";
 		uint32 verify_interval;
 		winsif_PriorityClass prioritiy_class;
 		uint32 num_worker_threads;
-		winsif_Stat stat;
+		winsif_Stat wstat;
 	} winsif_Results;
 
 	typedef enum {
@@ -307,7 +307,7 @@ import "nbt.idl";
 		uint32 verify_interval;
 		winsif_PriorityClass prioritiy_class;
 		uint32 num_worker_threads;
-		winsif_Stat stat;
+		winsif_Stat wstat;
 	} winsif_ResultsNew;
 
 	WERROR winsif_WinsStatusNew(


-- 
Samba Shared Repository