luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-01 15:03:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

define PCRE_STATIC to reflect the inclusion of pcre as LIB, not

Browse Source 
2007-03-17  Hans Breuer  <hans@breuer.org>

	* glib/makefile.msc.in glib/pcre/makefile.msc 
	  glib/update-pcre/update.sh : define PCRE_STATIC to reflect the 
	inclusion of pcre as LIB, not stand-alone DLL. Also set NEWLINE=-1
	to match any newline by default, use of ../../build/win32/make.msc

	* glib/gregex.h : minimal includes of <glib/*.H> instead of <glib.h>

	* glib/gnulib/makefile.msc : make use of ../../build/win32/make.msc

	* tests/regex-test.c(verbose): don't pass a string containing '%' 
	as first parameter to g_print ()
	(test_match) : for the unexpected case output pattern and string
	escaped

	* tests/child-test.c tests/slice-color.c : fix c99ism
	* tests/slice-test.c : fix c99ism and gccism
	* tests/mapping-test.c tests/base-64-tests.c : don't 
	#include <unistd.h> unconditionally
	* tests/option-test.c : use G_GINT64_CONSTANT() instead of direct LL

	* tests/makefile.msc.in : more tests build


svn path=/trunk/; revision=5423
This commit is contained in:
Hans Breuer
2007-03-17 09:49:09 +00:00
committed by Hans Breuer
parent 45b2988d05
commit 770b29bad2
14 changed files with 157 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tests/slice-color.c
View File

@@ -60,17 +60,20 @@ touch_mem (guint64 block_size,
guint64 repeats)
{
guint64 j, accu, n = n_blocks;
GTimer *timer;
guint **memc;
guint **memb;
guint **mema = g_new (guint*, n);
for (j = 0; j < n; j++)
mema[j] = g_slice_alloc (block_size);
guint **memb = g_new (guint*, n);
memb = g_new (guint*, n);
for (j = 0; j < n; j++)
memb[j] = g_slice_alloc (block_size);
guint **memc = g_new (guint*, n);
memc = g_new (guint*, n);
for (j = 0; j < n; j++)
memc[j] = g_slice_alloc (block_size);
GTimer *timer = g_timer_new();
timer = g_timer_new();
fill_memory (mema, n, 2);
fill_memory (memb, n, 3);
fill_memory (memc, n, 4);
@@ -148,6 +151,9 @@ parse_memsize (const gchar *cstring)
gchar *string = g_strstrip (mem);
guint l = strlen (string);
gdouble f = 0;
gchar *derr = NULL;
gdouble msize;
switch (l ? string[l - 1] : 0)
{
case 'k': f = 1000; break;
@@ -159,8 +165,7 @@ parse_memsize (const gchar *cstring)
}
if (f)
string[l - 1] = 0;
gchar *derr = NULL;
gdouble msize = g_ascii_strtod (string, &derr);
msize = g_ascii_strtod (string, &derr);
g_free (mem);
if (derr && *derr)
{