cvs up

brynet · Feb 20, 2016 · 4383e58 · 4383e58
1 parent 4234b1a
commit 4383e58
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/CVS/Entries b/CVS/Entries
@@ -6,9 +6,9 @@ D/magdir////
 /magic-common.c/1.3/Tue Aug 11 23:18:38 2015//
 /Makefile/1.16/Result of merge//
 /magic.h/1.11/Result of merge//
-/magic-test.c/1.15/Result of merge//
 /magic-load.c/1.19/Sun Nov 15 22:15:20 2015//
 /xmalloc.c/1.3/Result of merge//
 /xmalloc.h/1.3/Thu Nov 19 00:07:39 2015//
 /file.c/1.57/Result of merge//
 /file.1/1.44/Thu Dec 24 14:57:59 2015//
+/magic-test.c/1.16/Result of merge//
diff --git a/magic-test.c b/magic-test.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: magic-test.c,v 1.15 2015/10/06 08:20:10 nicm Exp $ */
+/* $OpenBSD: magic-test.c,v 1.16 2016/02/20 15:29:37 nicm Exp $ */
 
 /*
  * Copyright (c) 2015 Nicholas Marriott <nicm@openbsd.org>
@@ -509,7 +509,7 @@ static int
 magic_test_type_float(struct magic_line *ml, struct magic_state *ms)
 {
 	uint32_t	value0;
-	double		value;
+	float		value;
 	int		result;
 
 	if (magic_copy_from(ms, -1, &value0, sizeof value0) != 0)