Move count_words() to wordlist.c

include/thread.h

@@ -6,6 +6,8 @@
 #ifndef _THREAD_H
 #define _THREAD_H
 
+#include <signal.h>
+
 #if defined (_POSIX)
 #include <pthread.h>
 #include <semaphore.h>
@@ -46,4 +48,21 @@ typedef pthread_mutex_t   hc_thread_mutex_t;
 
 #endif
 
+#if defined (_WIN)
+
+BOOL WINAPI sigHandler_default (DWORD sig);
+BOOL WINAPI sigHandler_benchmark (DWORD sig);
+void hc_signal (BOOL WINAPI (callback) (DWORD));
+
+#else
+
+void sigHandler_default (int sig);
+void sigHandler_benchmark (int sig);
+void hc_signal (void (callback) (int));
+
+#endif
+
+void myabort ();
+void myquit ();
+
 #endif // _THREAD_H

include/wordlist.h

@@ -31,4 +31,6 @@ void get_next_word (wl_data_t *wl_data, FILE *fd, char **out_buf, uint *out_len)
 
 void pw_add (hc_device_param_t *device_param, const u8 *pw_buf, const int pw_len);
 
+u64 count_words (wl_data_t *wl_data, FILE *fd, const char *dictfile, dictstat_ctx_t *dictstat_ctx);
+
 #endif // _WORDLIST_H