Changeset 745 for trunk/server/source3/web/neg_lang.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/web/neg_lang.c (modified) (3 diffs)

trunk/server/source3/web/neg_lang.c

@@ -21 +21 @@
 #include "includes.h"
 #include "web/swat_proto.h"
+#include "intl/lang_tdb.h"
 
 /*
@@ -52 +53 @@
 };
 
-static int qsort_cmp_list(const void *x, const void *y) {
-        struct pri_list *a = (struct pri_list *)x;
-        struct pri_list *b = (struct pri_list *)y;
+static int qsort_cmp_list(struct pri_list *a, struct pri_list *b)
+{
         if (a->pri > b->pri) return -1;
         if (a->pri < b->pri) return 1;
@@ -102 +102 @@
         TALLOC_FREE(lang_list);
 
-        qsort(pl, lang_num, sizeof(struct pri_list), &qsort_cmp_list);
+        TYPESAFE_QSORT(pl, lang_num, qsort_cmp_list);
 
         /* it's not an error to not initialise - we just fall back to