[SCM] Samba Shared Repository - branch v3-6-test updated

[Björn Jacke]

The branch, v3-6-test has been updated
       via  fbd65b6 libreplace: fix endless strerror_r has been redefined warnings on AIX (cherry picked from commit 9b73bb0099d6b33d9e951895be3c877628b6c7dd)
       via  eb665fa tevent: include libreplace heade before tevent header
      from  a99388b Fix bug #7693 - smbd changing mode of files on rename

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit fbd65b6c859905855c473b47101a4843048ee4a5
Author: Björn Jacke <bj at sernet.de>
Date:   Wed Sep 22 11:16:47 2010 -0700

    libreplace: fix endless strerror_r has been redefined warnings on AIX
    (cherry picked from commit 9b73bb0099d6b33d9e951895be3c877628b6c7dd)

commit eb665fa13f2f291c4aa36313defb70ba335a5186
Author: Björn Jacke <bj at sernet.de>
Date:   Tue Sep 21 19:08:40 2010 -0700

    tevent: include libreplace heade before tevent header
    
    this is supposed to fix bug #7463. Thanks to Joachim Schmitz.
    (cherry picked from commit 7c9dab47618a809792cfdc43f0e3c5d88d2d7843)

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

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


Changeset truncated at 500 lines:

diff --git a/lib/replace/replace.h b/lib/replace/replace.h
index 7b455a5..faaaa66 100644
--- a/lib/replace/replace.h
+++ b/lib/replace/replace.h
@@ -513,6 +513,7 @@ char *rep_get_current_dir_name(void);
 #endif
 
 #if !defined(HAVE_STRERROR_R) || !defined(STRERROR_R_PROTO_COMPATIBLE)
+#undef strerror_r
 #define strerror_r rep_strerror_r
 int rep_strerror_r(int errnum, char *buf, size_t buflen);
 #endif
diff --git a/lib/util/tevent_unix.c b/lib/util/tevent_unix.c
index 0a8c4c6..e4c960e 100644
--- a/lib/util/tevent_unix.c
+++ b/lib/util/tevent_unix.c
@@ -21,8 +21,8 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "tevent_unix.h"
 #include "../replace/replace.h"
+#include "tevent_unix.h"
 
 bool tevent_req_is_unix_error(struct tevent_req *req, int *perrno)
 {


-- 
Samba Shared Repository