null+****@clear*****
null+****@clear*****
2011年 10月 25日 (火) 16:58:22 JST
Kouhei Sutou 2011-10-25 07:58:22 +0000 (Tue, 25 Oct 2011)
New Revision: 07c38f537e952d841d3845bb51a77db0e9072978
Log:
include system headers after '#includ <config.h>'.
Modified files:
lib/geo.c
lib/plugin.c
lib/proc.c
lib/util.c
src/grntest.c
test/unit/fixtures/plugins/string.c
Modified: lib/geo.c (+3 -2)
===================================================================
--- lib/geo.c 2011-10-25 07:52:07 +0000 (95eb2d1)
+++ lib/geo.c 2011-10-25 07:58:22 +0000 (6ebb19a)
@@ -15,12 +15,13 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <string.h>
-#include <stdlib.h>
#include "geo.h"
#include "pat.h"
#include "util.h"
+#include <string.h>
+#include <stdlib.h>
+
typedef struct {
grn_id id;
double d;
Modified: lib/plugin.c (+3 -2)
===================================================================
--- lib/plugin.c 2011-10-25 07:52:07 +0000 (2ad3cc0)
+++ lib/plugin.c 2011-10-25 07:58:22 +0000 (3590501)
@@ -15,13 +15,14 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <stdio.h>
-#include <string.h>
#include "db.h"
#include "plugin_in.h"
#include "ql.h"
#include "util.h"
+#include <stdio.h>
+#include <string.h>
+
static grn_hash *grn_plugins = NULL;
#define PATHLEN(filename) (strlen(filename) + 1)
Modified: lib/proc.c (+6 -5)
===================================================================
--- lib/proc.c 2011-10-25 07:52:07 +0000 (1ae57ec)
+++ lib/proc.c 2011-10-25 07:58:22 +0000 (958954b)
@@ -15,11 +15,6 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <string.h>
-#include <stdlib.h>
-#define __USE_GNU
-#include <fcntl.h>
-#include <sys/stat.h>
#include "proc.h"
#include "ql.h"
#include "ii.h"
@@ -29,6 +24,12 @@
#include "pat.h"
#include "geo.h"
+#include <string.h>
+#include <stdlib.h>
+#define __USE_GNU
+#include <fcntl.h>
+#include <sys/stat.h>
+
#ifndef O_NOFOLLOW
#define O_NOFOLLOW 0
#endif
Modified: lib/util.c (+3 -2)
===================================================================
--- lib/util.c 2011-10-25 07:52:07 +0000 (e7cac41)
+++ lib/util.c 2011-10-25 07:58:22 +0000 (1dee1c0)
@@ -15,13 +15,14 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <string.h>
-#include <stdio.h>
#include "db.h"
#include "pat.h"
#include "ii.h"
#include "util.h"
+#include <string.h>
+#include <stdio.h>
+
grn_rc
grn_normalize_offset_and_limit(grn_ctx *ctx, int size, int *p_offset, int *p_limit)
{
Modified: src/grntest.c (+4 -4)
===================================================================
--- src/grntest.c 2011-10-25 07:52:07 +0000 (b462656)
+++ src/grntest.c 2011-10-25 07:58:22 +0000 (94b7152)
@@ -16,6 +16,10 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif /* HAVE_CONFIG_H */
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -23,10 +27,6 @@
#include <sys/types.h>
#include <sys/stat.h>
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif /* HAVE_CONFIG_H */
-
#ifdef HAVE_SYS_WAIT_H
#include <sys/wait.h>
#endif /* HAVE_SYS_WAIT_H */
Modified: test/unit/fixtures/plugins/string.c (+2 -2)
===================================================================
--- test/unit/fixtures/plugins/string.c 2011-10-25 07:52:07 +0000 (c5c202c)
+++ test/unit/fixtures/plugins/string.c 2011-10-25 07:58:22 +0000 (9e28be5)
@@ -16,11 +16,11 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <string.h>
-
#include <str.h>
#include <groonga/plugin.h>
+#include <string.h>
+
static grn_obj *
func_str_len(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_data)
{