Use "#pragma once" instead of include guard

Because "#pragma once" is sufficiency portable. https://en.wikipedia.org/wiki/Pragma_once#Portability says the following compiler supports "#pragma once": * Clang * Comeau C/C++ * C++Builder XE3 * Digital Mars C++ * GCC * HP C/aC++ * IBM XL C/C++ * Intel C++ Compiler * Microsoft Visual C++ * Pelles C * ARM DS-5 * IAR C/C++ "Solaris Studio C/C++" doesn't support "#pragma once" but we don't support "Solaris Studio C/C++".
groonga · Jan 12, 2016 · 7c488ff · 7c488ff
1 parent b0d4cdf
commit 7c488ff
Show file tree

Hide file tree

Showing 134 changed files with 353 additions and 653 deletions.
diff --git a/include/groonga.h b/include/groonga.h
@@ -1,5 +1,5 @@
 /*
-  Copyright(C) 2014-2015 Brazil
+  Copyright(C) 2014-2016 Brazil
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -15,8 +15,8 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
-#ifndef GROONGA_H
-#define GROONGA_H
+
+#pragma once
 
 #include "groonga/portability.h"
 #include "groonga/groonga.h"
@@ -32,5 +32,3 @@
 #include "groonga/windows.h"
 #include "groonga/windows_event_logger.h"
 #include "groonga/file_reader.h"
-
-#endif /* GROONGA_H */
diff --git a/include/groonga/command.h b/include/groonga/command.h
@@ -1,6 +1,6 @@
 /* -*- c-basic-offset: 2 -*- */
 /*
-  Copyright(C) 2015 Brazil
+  Copyright(C) 2015-2016 Brazil
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -15,8 +15,8 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
-#ifndef GROONGA_COMMAND_H
-#define GROONGA_COMMAND_H
+
+#pragma once
 
 #include <groonga/plugin.h>
 
@@ -77,5 +77,3 @@ GRN_PLUGIN_EXPORT grn_rc grn_command_run(grn_ctx *ctx,
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif  /* __cplusplus */
-
-#endif  /* GROONGA_COMMAND_H */
diff --git a/include/groonga/conf.h b/include/groonga/conf.h
@@ -1,6 +1,6 @@
 /* -*- c-basic-offset: 2 -*- */
 /*
-  Copyright(C) 2015 Brazil
+  Copyright(C) 2015-2016 Brazil
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -16,8 +16,7 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#ifndef GRN_CONF_H
-#define GRN_CONF_H
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -38,5 +37,3 @@ GRN_API grn_rc grn_conf_get(grn_ctx *ctx,
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* GRN_CONF_H */
diff --git a/include/groonga/expr.h b/include/groonga/expr.h
@@ -1,5 +1,5 @@
 /*
-  Copyright(C) 2009-2015 Brazil
+  Copyright(C) 2009-2016 Brazil
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -15,8 +15,8 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
-#ifndef GROONGA_EXPR_H
-#define GROONGA_EXPR_H
+
+#pragma once
 
 #ifdef  __cplusplus
 extern "C" {
@@ -107,5 +107,3 @@ GRN_API unsigned int grn_expr_estimate_size(grn_ctx *ctx, grn_obj *expr);
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* GROONGA_EXPR_H */
diff --git a/include/groonga/file_reader.h b/include/groonga/file_reader.h
@@ -1,5 +1,5 @@
 /*
-  Copyright(C) 2015 Brazil
+  Copyright(C) 2015-2016 Brazil
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -16,8 +16,7 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#ifndef GROONGA_FILE_READER_H
-#define GROONGA_FILE_READER_H
+#pragma once
 
 #ifdef  __cplusplus
 extern "C" {
@@ -36,5 +35,3 @@ GRN_API grn_rc grn_file_reader_read_line(grn_ctx *ctx,
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* GROONGA_FILE_READER_H */
diff --git a/include/groonga/geo.h b/include/groonga/geo.h
@@ -1,6 +1,6 @@
 /* -*- c-basic-offset: 2 -*- */
 /*
-  Copyright(C) 2015 Brazil
+  Copyright(C) 2015-2016 Brazil
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -17,8 +17,7 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#ifndef GROONGA_GEO_H
-#define GROONGA_GEO_H
+#pragma once
 
 #ifdef  __cplusplus
 extern "C" {
@@ -35,5 +34,3 @@ GRN_API int grn_geo_table_sort(grn_ctx *ctx,
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* GROONGA_GEO_H */
diff --git a/include/groonga/groonga.h b/include/groonga/groonga.h
@@ -1,5 +1,5 @@
 /*
-  Copyright(C) 2009-2015 Brazil
+  Copyright(C) 2009-2016 Brazil
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -15,8 +15,8 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
-#ifndef GROONGA_GROONGA_H
-#define GROONGA_GROONGA_H
+
+#pragma once
 
 #include <stdarg.h>
 #include <sys/types.h>
@@ -2044,5 +2044,3 @@ GRN_API grn_rc grn_dat_cursor_delete(grn_ctx *ctx, grn_dat_cursor *c,
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* GROONGA_GROONGA_H */
diff --git a/include/groonga/ii.h b/include/groonga/ii.h
@@ -1,5 +1,5 @@
 /*
-  Copyright(C) 2009-2014 Brazil
+  Copyright(C) 2009-2016 Brazil
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -15,8 +15,8 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
-#ifndef GROONGA_II_H
-#define GROONGA_II_H
+
+#pragma once
 
 #ifdef  __cplusplus
 extern "C" {
@@ -57,5 +57,3 @@ GRN_API grn_rc grn_ii_cursor_close(grn_ctx *ctx, grn_ii_cursor *c);
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* GROONGA_II_H */
diff --git a/include/groonga/nfkc.h b/include/groonga/nfkc.h
@@ -1,5 +1,6 @@
 /* -*- c-basic-offset: 2 -*- */
-/* Copyright(C) 2009 Brazil
+/*
+  Copyright(C) 2009-2016 Brazil
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -14,8 +15,8 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
-#ifndef GROONGA_NFKC_H
-#define GROONGA_NFKC_H
+
+#pragma once
 
 #include <groonga.h>
 
@@ -28,5 +29,3 @@ GRN_API grn_char_type grn_nfkc_char_type(const unsigned char *str);
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* GROONGA_NFKC_H */
diff --git a/include/groonga/normalizer.h b/include/groonga/normalizer.h
@@ -1,6 +1,6 @@
 /* -*- c-basic-offset: 2 -*- */
 /*
-  Copyright(C) 2012 Brazil
+  Copyright(C) 2012-2016 Brazil
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -15,8 +15,8 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
-#ifndef GROONGA_NORMALIER_H
-#define GROONGA_NORMALIER_H
+
+#pragma once
 
 #include <stddef.h>
 
@@ -51,5 +51,3 @@ GRN_PLUGIN_EXPORT grn_rc grn_normalizer_register(grn_ctx *ctx,
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif  /* __cplusplus */
-
-#endif  /* GROONGA_NORMALIER_H */
diff --git a/include/groonga/obj.h b/include/groonga/obj.h
@@ -1,6 +1,6 @@
 /* -*- c-basic-offset: 2 -*- */
 /*
-  Copyright(C) 2015 Brazil
+  Copyright(C) 2015-2016 Brazil
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -16,8 +16,8 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
-#ifndef GROONGA_OBJ_H
-#define GROONGA_OBJ_H
+
+#pragma once
 
 #ifdef  __cplusplus
 extern "C" {
@@ -54,5 +54,3 @@ GRN_API grn_rc grn_obj_reindex(grn_ctx *ctx, grn_obj *obj);
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* GROONGA_OBJ_H */
diff --git a/include/groonga/output.h b/include/groonga/output.h
@@ -1,5 +1,5 @@
 /*
-  Copyright(C) 2009-2015 Brazil
+  Copyright(C) 2009-2016 Brazil
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -15,8 +15,8 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
-#ifndef GROONGA_OUTPUT_H
-#define GROONGA_OUTPUT_H
+
+#pragma once
 
 #ifdef  __cplusplus
 extern "C" {
@@ -106,5 +106,3 @@ GRN_API grn_rc grn_text_otoj(grn_ctx *ctx, grn_obj *bulk, grn_obj *obj,
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* GROONGA_OUTPUT_H */
diff --git a/include/groonga/plugin.h b/include/groonga/plugin.h
@@ -1,6 +1,6 @@
 /* -*- c-basic-offset: 2 -*- */
 /*
-  Copyright(C) 2010-2014 Brazil
+  Copyright(C) 2010-2016 Brazil
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -15,8 +15,8 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
-#ifndef GROONGA_PLUGIN_H
-#define GROONGA_PLUGIN_H
+
+#pragma once
 
 #include <stddef.h>
 
@@ -172,5 +172,3 @@ GRN_API grn_obj *grn_plugin_command_create(grn_ctx *ctx,
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* GROONGA_PLUGIN_H */
diff --git a/include/groonga/portability.h b/include/groonga/portability.h
@@ -1,5 +1,5 @@
 /*
-  Copyright(C) 2015 Brazil
+  Copyright(C) 2015-2016 Brazil
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -15,8 +15,8 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
-#ifndef GROONGA_PORTABILITY_H
-#define GROONGA_PORTABILITY_H
+
+#pragma once
 
 #ifdef WIN32
 # ifdef __cplusplus
@@ -170,5 +170,3 @@
 #else /* WIN32 */
 # define grn_close(fd) close((fd))
 #endif /* WIN32 */
-
-#endif /* GROONGA_PORTABILITY_H */
diff --git a/include/groonga/request_canceler.h b/include/groonga/request_canceler.h
@@ -1,5 +1,5 @@
 /*
-  Copyright(C) 2014 Brazil
+  Copyright(C) 2014-2016 Brazil
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -16,8 +16,7 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#ifndef GROONGA_REQUEST_CANCELER_H
-#define GROONGA_REQUEST_CANCELER_H
+#pragma once
 
 #ifdef  __cplusplus
 extern "C" {
@@ -35,5 +34,3 @@ GRN_API grn_bool grn_request_canceler_cancel(const char *request_id,
 #ifdef __cplusplus
 }
 #endif
-
-#endif /* GROONGA_REQUEST_CANCELER_H */
diff --git a/include/groonga/scorer.h b/include/groonga/scorer.h
@@ -1,6 +1,6 @@
 /* -*- c-basic-offset: 2 -*- */
 /*
-  Copyright(C) 2015 Brazil
+  Copyright(C) 2015-2016 Brazil
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -15,8 +15,8 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
-#ifndef GROONGA_SCORER_H
-#define GROONGA_SCORER_H
+
+#pragma once
 
 #include <groonga/plugin.h>
 
@@ -91,5 +91,3 @@ GRN_PLUGIN_EXPORT grn_rc grn_scorer_register(grn_ctx *ctx,
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif  /* __cplusplus */
-
-#endif  /* GROONGA_SCORER_H */