* configure.ac:

* src/lib/Makefile.am:
	* src/lib/evil_fnmatch.c:
	* src/lib/evil_fnmatch_list_of_states.c:
	add guards instead of not including fnmatch source
	file in Makefile.am (for mingw32ce only)
	* src/bin/Makefile.am:
	* src/bin/evil_suite.c:
	* src/bin/evil_test_memcpy.c:
	* src/bin/suite.c:
	* src/bin/suite.h:
	* src/bin/test_memcpy.c:
	* src/bin/test_memcpy.h:
	rename files



SVN revision: 36580

legacy/evil/ChangeLog

@@ -1,3 +1,21 @@
+2008-10-11  Vincent Torri  <doursse at users dot sf dot net>
+
+	* configure.ac:
+	* src/lib/Makefile.am:
+	* src/lib/evil_fnmatch.c:
+	* src/lib/evil_fnmatch_list_of_states.c:
+	add guards instead of not including fnmatch source
+	file in Makefile.am (for mingw32ce only)
+
+	* src/bin/Makefile.am:
+	* src/bin/evil_suite.c:
+	* src/bin/evil_test_memcpy.c:
+	* src/bin/suite.c:
+	* src/bin/suite.h:
+	* src/bin/test_memcpy.c:
+	* src/bin/test_memcpy.h:
+	rename files
+
 2008-10-09  Vincent Torri  <doursse at users dot sf dot net>
 
 	* AUTHORS:

legacy/evil/configure.ac

@@ -97,7 +97,6 @@ if test "x${have_wince}" = "xyes" ; then
 fi
 
 AM_CONDITIONAL(EVIL_HAVE_WINCE, test "x${have_wince}" = "xyes")
-AM_CONDITIONAL(EVIL_HAVE_MINGW32CE, test "x${have_mingw32ce}" = "xyes")
 
 
 ### Checks for linker characteristics

legacy/evil/src/bin/Makefile.am

@@ -9,13 +9,13 @@ AM_CPPFLAGS = \
 
 AM_CFLAGS = @win32_cflags@
 
-bin_PROGRAMS = suite test_dlfcn test_pipe test_evil
+bin_PROGRAMS = evil_suite test_dlfcn test_pipe test_evil
 
-suite_SOURCES = suite.c test_memcpy.c
+evil_suite_SOURCES = evil_suite.c evil_test_memcpy.c
 
 if EVIL_HAVE_WINCE
 
-suite_SOURCES +=  memcpy_glibc_arm.S
+evil_suite_SOURCES +=  memcpy_glibc_arm.S
 
 #else
 
@@ -23,8 +23,8 @@ suite_SOURCES +=  memcpy_glibc_arm.S
 
 endif
 
-suite_LDADD = $(top_builddir)/src/lib/libevil.la
-suite_LDFLAGS = -Wl,--enable-auto-import
+evil_suite_LDADD = $(top_builddir)/src/lib/libevil.la
+evil_suite_LDFLAGS = -Wl,--enable-auto-import
 
 test_dlfcn_SOURCES = test_dlfcn.c
 test_dlfcn_LDADD = $(top_builddir)/src/lib/libevil.la $(top_builddir)/src/lib/dlfcn/libdl.la
@@ -38,4 +38,4 @@ test_evil_SOURCES = test_evil.c
 test_evil_LDADD = $(top_builddir)/src/lib/libevil.la
 test_evil_LDFLAGS = -Wl,--enable-auto-import
 
-EXTRA_DIST = suite.h test_memcpy.h
+EXTRA_DIST = evil_suite.h evil_test_memcpy.h

legacy/evil/src/bin/evil_suite.c

@@ -5,8 +5,8 @@
 #include <windows.h>
 #undef WIN32_LEAN_AND_MEAN
 
-#include "suite.h"
-#include "test_memcpy.h"
+#include "evil_suite.h"
+#include "evil_test_memcpy.h"
 
 
 typedef void(*function)(void);
@@ -35,6 +35,15 @@ unsigned char *buf2 = NULL;
 size_t         page_size = 0;
 
 
+#ifdef __MINGW32CE__
+static int
+getpagesize()
+{
+   return 1024;
+}
+#endif /* __MINGW32CE__ */
+
+
 suite *
 suite_new(void)
 {
@@ -150,7 +159,7 @@ main()
    suite *s;
    int i;
 
-   page_size = 2 * getpagesize();
+   page_size = 2 * 1024;
 
    buf1 = (unsigned char *)malloc(16 * getpagesize());
    if (!buf1) return EXIT_FAILURE;

legacy/evil/src/bin/evil_test_memcpy.c

@@ -11,8 +11,8 @@
 # include "config.h"
 #endif /* HAVE_CONFIG_H */
 
-#include "suite.h"
-#include "test_memcpy.h"
+#include "evil_suite.h"
+#include "evil_test_memcpy.h"
 
 
 typedef void *(*memcpy_decl)(void *dest, const void *src, size_t n);

legacy/evil/src/bin/suite.h

@@ -1,18 +0,0 @@
-#ifndef __EVIL_SUITE_H__
-#define __EVIL_SUITE_H__
-
-
-typedef struct test test;
-typedef struct list list;
-typedef struct suite suite;
-
-LARGE_INTEGER freq;
-LARGE_INTEGER start;
-LARGE_INTEGER end;
-
-void suite_time_start();
-void suite_time_stop();
-double suite_time_get();
-
-
-#endif /* __EVIL_SUITE_H__ */

legacy/evil/src/bin/test_memcpy.h

@@ -1,8 +0,0 @@
-#ifndef __EVIL_TEST_MEMCPY__
-#define __EVIL_TEST_MEMCPY__
-
-
-void test_memcpy(void);
-
-
-#endif /* __EVIL_TEST_MEMCPY__ */

legacy/evil/src/lib/Makefile.am

@@ -13,17 +13,13 @@ evil_stdlib.h \
 evil_unistd.h \
 evil_util.h
 
-nobase_include_HEADERS = pwd.h sys/mman.h
-
-if EVIL_HAVE_MINGW32CE
-
-nobase_include_HEADERS += fnmatch.h
-
-endif
+nobase_include_HEADERS = fnmatch.h pwd.h sys/mman.h
 
 libevil_la_SOURCES = \
 evil.c \
 evil_fcntl.c \
+evil_fnmatch.c \
+evil_fnmatch_list_of_states.c \
 evil_langinfo.c \
 evil_mman.c \
 evil_pwd.c \
@@ -31,12 +27,6 @@ evil_stdlib.c \
 evil_unistd.c \
 evil_util.c
 
-if EVIL_HAVE_MINGW32CE
-
-libevil_la_SOURCES += evil_fnmatch.c evil_fnmatch_list_of_states.c
-
-endif
-
 libevil_la_CPPFLAGS = -DEFL_EVIL_BUILD -D_WIN32_WCE=0x0420
 libevil_la_CFLAGS = @win32_cflags@
 libevil_la_LIBADD = @win32_libs@ $(EFL_MPATROL_LIBS)

legacy/evil/src/lib/evil_fnmatch.c

@@ -1,3 +1,5 @@
+#if defined (_MSC_VER) || defined (__MINGW32CE__)
+
 #include <assert.h>
 #include <string.h>
 
@@ -225,3 +227,5 @@ fnmatch(const char *pattern,
   fnmatch_list_of_states_free(states < new_states ? states : new_states, 2);
   return r;
 }
+
+#endif /* _MSC_VER || __MINGW32CE__ */

legacy/evil/src/lib/evil_fnmatch_list_of_states.c

@@ -1,3 +1,5 @@
+#if defined (_MSC_VER) || defined (__MINGW32CE__)
+
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
@@ -70,3 +72,5 @@ fnmatch_list_of_states_clear(struct list_of_states *list)
   list->size = 0;
   memset(list->has, 0, list->reserved * sizeof (*list->has));
 }
+
+#endif /* _MSC_VER || __MINGW32CE__ */