Fix printf-tests on W32 by ifdefing the expected output

[platform/upstream/glib.git] / glib / gprimes.c

diff --git a/glib/gprimes.c b/glib/gprimes.c
index 6a38b39..caa6418 100644 (file)
--- a/glib/gprimes.c
+++ b/glib/gprimes.c
@@ -2,30 +2,40 @@
  * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
-#include "glib.h"
 
+/*
+ * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GLib Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GLib at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+/*
+ * MT safe
+ */
+
+#include "config.h"
 
-gint g_primes[] =
+#include "gprimes.h"
+
+
+static const guint g_primes[] =
 {
   11,
-  15,
-  23,
-  35,
-  49,
+  19,
+  37,
   73,
   109,
   163,
@@ -59,4 +69,28 @@ gint g_primes[] =
   13845163,
 };
 
-gint g_nprimes = sizeof (g_primes) / sizeof (g_primes[0]);
+/**
+ * g_spaced_primes_closest:
+ * @num: a #guint
+ *
+ * Gets the smallest prime number from a built-in array of primes which
+ * is larger than @num. This is used within GLib to calculate the optimum
+ * size of a #GHashTable.
+ *
+ * The built-in array of primes ranges from 11 to 13845163 such that
+ * each prime is approximately 1.5-2 times the previous prime.
+ *
+ * Returns: the smallest prime number from a built-in array of primes
+ *     which is larger than @num
+ */
+guint
+g_spaced_primes_closest (guint num)
+{
+  gint i;
+
+  for (i = 0; i < G_N_ELEMENTS (g_primes); i++)
+    if (g_primes[i] > num)
+      return g_primes[i];
+
+  return g_primes[G_N_ELEMENTS (g_primes) - 1];
+}