[SCM] Samba Shared Repository - branch master updated

[Björn Jacke]

The branch, master has been updated
       via  6edb239 replace: fix unused variable warning
       via  6a3b3fa Revert "replace: fix unused variable warning"
      from  43c56dc s3: fix build without ads support

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


- Log -----------------------------------------------------------------
commit 6edb239f8ed724abaa594fbbac8c2eb6e485209e
Author: Björn Jacke <bj at sernet.de>
Date:   Wed Jun 13 22:02:53 2012 +0200

    replace: fix unused variable warning
    
    e2747fc62c2acbab143c4971469e0a4fc36d8789 fixed ...
    
    Autobuild-User(master): Björn Jacke <bj at sernet.de>
    Autobuild-Date(master): Wed Jun 13 23:57:58 CEST 2012 on sn-devel-104

commit 6a3b3fa3b079072d6a4bc399e3e410a9bd09b42b
Author: Björn Jacke <bj at sernet.de>
Date:   Wed Jun 13 21:55:42 2012 +0200

    Revert "replace: fix unused variable warning"
    
    This reverts commit e2747fc62c2acbab143c4971469e0a4fc36d8789.
    
    one line slipped into a wrong ifndef ...

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

Summary of changes:
 lib/replace/strptime.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/replace/strptime.c b/lib/replace/strptime.c
index 181fd12..20e5d8c 100644
--- a/lib/replace/strptime.c
+++ b/lib/replace/strptime.c
@@ -298,7 +298,9 @@ strptime_internal (rp, fmt, tm, decided, era_cnt)
 #ifndef _NL_CURRENT
       /* We need this for handling the `E' modifier.  */
     start_over:
+#endif
 
+#ifdef _NL_CURRENT
       /* Make back up of current processing pointer.  */
       rp_backup = rp;
 #endif


-- 
Samba Shared Repository