[SCM] Samba Shared Repository - branch master updated - b1a1fbcbfb8f7d9b09bd26407ca4185b2cb4a0e3

[Jelmer Vernooij]

The branch, master has been updated
       via  b1a1fbcbfb8f7d9b09bd26407ca4185b2cb4a0e3 (commit)
       via  07426353554cb883b566a3c27edbbf8e8ac39399 (commit)
      from  5380d43d3bc84f431d491c40ad37920973870e4e (commit)

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


- Log -----------------------------------------------------------------
commit b1a1fbcbfb8f7d9b09bd26407ca4185b2cb4a0e3
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Oct 19 09:53:18 2008 +0200

    Remove defines for QSORT_CAST, already provided by libreplace.

commit 07426353554cb883b566a3c27edbbf8e8ac39399
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Oct 19 09:51:26 2008 +0200

    Simplify SIG_ATOMIC_T define, since sig_atomic_t is always provided by
    libreplace.

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

Summary of changes:
 source3/include/includes.h |   14 ++------------
 1 files changed, 2 insertions(+), 12 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 760280e..ac5b2b2 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -271,12 +271,10 @@ typedef int ber_int_t;
 /*
  * Define additional missing types
  */
-#if defined(HAVE_SIG_ATOMIC_T_TYPE) && defined(AIX)
+#if defined(AIX)
 typedef sig_atomic_t SIG_ATOMIC_T;
-#elif defined(HAVE_SIG_ATOMIC_T_TYPE) && !defined(AIX)
-typedef sig_atomic_t volatile SIG_ATOMIC_T;
 #else
-typedef int volatile SIG_ATOMIC_T;
+typedef sig_atomic_t volatile SIG_ATOMIC_T;
 #endif
 
 #ifndef uchar
@@ -766,14 +764,6 @@ enum flush_reason_enum {
 /* prototypes from lib/util_transfer_file.c */
 #include "transfer_file.h"
 
-#ifdef __COMPAR_FN_T
-#define QSORT_CAST (__compar_fn_t)
-#endif
-
-#ifndef QSORT_CAST
-#define QSORT_CAST (int (*)(const void *, const void *))
-#endif
-
 #ifndef DEFAULT_PRINTING
 #ifdef HAVE_CUPS
 #define DEFAULT_PRINTING PRINT_CUPS


-- 
Samba Shared Repository