Move Windows related function to windows.c

groonga · Feb 3, 2017 · 643dc64 · 643dc64
1 parent 10a3836
commit 643dc64
Show file tree

Hide file tree

Showing 7 changed files with 71 additions and 41 deletions.
diff --git a/lib/error.c b/lib/error.c
@@ -1,5 +1,6 @@
 /* -*- c-basic-offset: 2 -*- */
-/* Copyright(C) 2013 Brazil
+/*
+  Copyright(C) 2013-2017 Brazil
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -16,7 +17,7 @@
 */
 
 #include "grn_error.h"
-#include "grn_util.h"
+#include "grn_windows.h"
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>

diff --git a/lib/grn_util.h b/lib/grn_util.h
@@ -40,10 +40,6 @@ void grn_p_record(grn_ctx *ctx, grn_obj *table, grn_id id);
 int grn_mkstemp(char *path_template);
 grn_bool grn_path_exist(const char *path);
 
-#ifdef WIN32
-GRN_API UINT grn_windows_encoding_to_code_page(grn_encoding encoding);
-#endif /* WIN32 */
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/grn_windows.h b/lib/grn_windows.h
@@ -0,0 +1,33 @@
+/* -*- c-basic-offset: 2 -*- */
+/*
+  Copyright(C) 2010-2017 Brazil
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License version 2.1 as published by the Free Software Foundation.
+
+  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
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#pragma once
+
+#include "grn.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef WIN32
+GRN_API UINT grn_windows_encoding_to_code_page(grn_encoding encoding);
+#endif /* WIN32 */
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/lib/sources.am b/lib/sources.am
@@ -94,6 +94,7 @@ libgroonga_la_SOURCES =				\
 	util.c					\
 	grn_util.h				\
 	windows.c				\
+	grn_windows.h				\
 	windows_event_logger.c			\
 	file_reader.c				\
 	window_function.c			\

diff --git a/lib/util.c b/lib/util.c
@@ -1572,34 +1572,3 @@ grn_path_exist(const char *path)
   struct stat status;
   return stat(path, &status) == 0;
 }
-
-#ifdef WIN32
-UINT
-grn_windows_encoding_to_code_page(grn_encoding encoding)
-{
-  UINT code_page;
-
-  switch (encoding) {
-  case GRN_ENC_EUC_JP :
-    code_page = 20932;
-    break;
-  case GRN_ENC_UTF8 :
-    code_page = CP_UTF8;
-    break;
-  case GRN_ENC_SJIS :
-    code_page = 932;
-    break;
-  case GRN_ENC_LATIN1 :
-    code_page = 1252;
-    break;
-  case GRN_ENC_KOI8R :
-    code_page = 20866;
-    break;
-  default :
-    code_page = CP_ACP;
-    break;
-  }
-
-  return code_page;
-}
-#endif /* WIN32 */
diff --git a/lib/windows.c b/lib/windows.c
@@ -1,6 +1,6 @@
 /* -*- c-basic-offset: 2 -*- */
 /*
-  Copyright(C) 2010-2015 Brazil
+  Copyright(C) 2010-2017 Brazil
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -17,6 +17,7 @@
 */
 
 #include "grn.h"
+#include "grn_windows.h"
 
 #ifdef WIN32
 static char *windows_base_dir = NULL;
@@ -71,4 +72,33 @@ grn_windows_base_dir(void)
   }
   return windows_base_dir;
 }
-#endif
+
+UINT
+grn_windows_encoding_to_code_page(grn_encoding encoding)
+{
+  UINT code_page;
+
+  switch (encoding) {
+  case GRN_ENC_EUC_JP :
+    code_page = 20932;
+    break;
+  case GRN_ENC_UTF8 :
+    code_page = CP_UTF8;
+    break;
+  case GRN_ENC_SJIS :
+    code_page = 932;
+    break;
+  case GRN_ENC_LATIN1 :
+    code_page = 1252;
+    break;
+  case GRN_ENC_KOI8R :
+    code_page = 20866;
+    break;
+  default :
+    code_page = CP_ACP;
+    break;
+  }
+
+  return code_page;
+}
+#endif /* WIN32 */
diff --git a/lib/windows_event_logger.c b/lib/windows_event_logger.c
@@ -1,6 +1,6 @@
 /* -*- c-basic-offset: 2 -*- */
 /*
-  Copyright(C) 2015 Brazil
+  Copyright(C) 2015-2017 Brazil
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -18,7 +18,7 @@
 
 #include "grn_logger.h"
 #include "grn_ctx.h"
-#include "grn_util.h"
+#include "grn_windows.h"
 
 #include <string.h>