From 7c488fff7a68ed10ca1cec70733d784c5caeb749 Mon Sep 17 00:00:00 2001 From: Kouhei Sutou Date: Tue, 12 Jan 2016 11:24:56 +0900 Subject: [PATCH] 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++". --- include/groonga.h | 8 +++----- include/groonga/command.h | 8 +++----- include/groonga/conf.h | 7 ++----- include/groonga/expr.h | 8 +++----- include/groonga/file_reader.h | 7 ++----- include/groonga/geo.h | 7 ++----- include/groonga/groonga.h | 8 +++----- include/groonga/ii.h | 8 +++----- include/groonga/nfkc.h | 9 ++++----- include/groonga/normalizer.h | 8 +++----- include/groonga/obj.h | 8 +++----- include/groonga/output.h | 8 +++----- include/groonga/plugin.h | 8 +++----- include/groonga/portability.h | 8 +++----- include/groonga/request_canceler.h | 7 ++----- include/groonga/scorer.h | 8 +++----- include/groonga/thread.h | 7 ++----- include/groonga/token.h | 8 +++----- include/groonga/token_filter.h | 8 +++----- include/groonga/tokenizer.h | 8 +++----- include/groonga/util.h | 8 +++----- include/groonga/windows.h | 7 ++----- include/groonga/windows_event_logger.h | 7 ++----- lib/dat/array.hpp | 8 +++----- lib/dat/base.hpp | 8 +++----- lib/dat/block.hpp | 8 +++----- lib/dat/check.hpp | 8 +++----- lib/dat/cursor-factory.hpp | 8 +++----- lib/dat/cursor.hpp | 8 +++----- lib/dat/dat.hpp | 8 +++----- lib/dat/entry.hpp | 8 +++----- lib/dat/file-impl.hpp | 8 +++----- lib/dat/file.hpp | 8 +++----- lib/dat/header.hpp | 8 +++----- lib/dat/id-cursor.hpp | 8 +++----- lib/dat/key-cursor.hpp | 8 +++----- lib/dat/key.hpp | 8 +++----- lib/dat/node.hpp | 8 +++----- lib/dat/predictive-cursor.hpp | 8 +++----- lib/dat/prefix-cursor.hpp | 8 +++----- lib/dat/string.hpp | 8 +++----- lib/dat/trie.hpp | 8 +++----- lib/dat/vector.hpp | 8 +++----- lib/grn.h | 8 +++----- lib/grn_com.h | 8 +++----- lib/grn_ctx.h | 8 +++----- lib/grn_ctx_impl.h | 8 +++----- lib/grn_ctx_impl_mrb.h | 7 ++----- lib/grn_dat.h | 12 ++++-------- lib/grn_db.h | 9 ++++----- lib/grn_error.h | 10 +++------- lib/grn_expr.h | 8 ++------ lib/grn_expr_code.h | 8 ++------ lib/grn_geo.h | 12 ++++-------- lib/grn_hash.h | 9 ++++----- lib/grn_ii.h | 9 ++++----- lib/grn_index_column.h | 7 ++----- lib/grn_io.h | 9 ++++----- lib/grn_logger.h | 8 +++----- lib/grn_mrb.h | 7 ++----- lib/grn_msgpack.h | 8 +++----- lib/grn_normalizer.h | 8 +++----- lib/grn_output.h | 9 ++++----- lib/grn_pat.h | 9 ++++----- lib/grn_plugin.h | 9 ++++----- lib/grn_proc.h | 9 ++++----- lib/grn_report.h | 7 ++----- lib/grn_request_canceler.h | 7 ++----- lib/grn_rset.h | 9 ++++----- lib/grn_scanner.h | 7 ++----- lib/grn_scorer.h | 8 +++----- lib/grn_scorers.h | 8 +++----- lib/grn_snip.h | 15 ++++----------- lib/grn_store.h | 9 ++++----- lib/grn_str.h | 9 ++++----- lib/grn_string.h | 26 ++++++-------------------- lib/grn_token_cursor.h | 9 ++++----- lib/grn_tokenizers.h | 9 ++++----- lib/grn_ts.h | 7 ++----- lib/grn_util.h | 9 ++++----- lib/mrb/mrb_accessor.h | 6 ++---- lib/mrb/mrb_array.h | 6 ++---- lib/mrb/mrb_bulk.h | 7 ++----- lib/mrb/mrb_cache.h | 6 ++---- lib/mrb/mrb_column.h | 6 ++---- lib/mrb/mrb_command.h | 6 ++---- lib/mrb/mrb_command_input.h | 6 ++---- lib/mrb/mrb_command_version.h | 6 ++---- lib/mrb/mrb_conf.h | 7 ++----- lib/mrb/mrb_content_type.h | 6 ++---- lib/mrb/mrb_converter.h | 7 ++----- lib/mrb/mrb_ctx.h | 6 ++---- lib/mrb/mrb_database.h | 6 ++---- lib/mrb/mrb_double_array_trie.h | 6 ++---- lib/mrb/mrb_error.h | 6 ++---- lib/mrb/mrb_expr.h | 6 ++---- lib/mrb/mrb_fixed_size_column.h | 6 ++---- lib/mrb/mrb_hash_table.h | 6 ++---- lib/mrb/mrb_id.h | 6 ++---- lib/mrb/mrb_index_column.h | 6 ++---- lib/mrb/mrb_index_cursor.h | 6 ++---- lib/mrb/mrb_logger.h | 6 ++---- lib/mrb/mrb_object.h | 6 ++---- lib/mrb/mrb_object_flags.h | 6 ++---- lib/mrb/mrb_operator.h | 6 ++---- lib/mrb/mrb_options.h | 6 ++---- lib/mrb/mrb_patricia_trie.h | 6 ++---- lib/mrb/mrb_procedure.h | 6 ++---- lib/mrb/mrb_query_logger.h | 6 ++---- lib/mrb/mrb_record.h | 7 ++----- lib/mrb/mrb_table.h | 6 ++---- lib/mrb/mrb_table_cursor.h | 6 ++---- lib/mrb/mrb_table_cursor_flags.h | 6 ++---- lib/mrb/mrb_table_group_flags.h | 6 ++---- lib/mrb/mrb_table_group_result.h | 7 ++----- lib/mrb/mrb_table_sort_flags.h | 7 ++----- lib/mrb/mrb_table_sort_key.h | 6 ++---- lib/mrb/mrb_type.h | 6 ++---- lib/mrb/mrb_variable_size_column.h | 6 ++---- lib/mrb/mrb_void.h | 6 ++---- lib/mrb/mrb_writer.h | 6 ++---- lib/ts/ts_buf.h | 6 ++---- lib/ts/ts_cursor.h | 6 ++---- lib/ts/ts_expr.h | 6 ++---- lib/ts/ts_expr_builder.h | 6 ++---- lib/ts/ts_expr_node.h | 6 ++---- lib/ts/ts_expr_parser.h | 6 ++---- lib/ts/ts_log.h | 6 ++---- lib/ts/ts_op.h | 6 ++---- lib/ts/ts_plan.h | 6 ++---- lib/ts/ts_sorter.h | 6 ++---- lib/ts/ts_str.h | 6 ++---- lib/ts/ts_types.h | 6 ++---- lib/ts/ts_util.h | 6 ++---- 134 files changed, 353 insertions(+), 653 deletions(-) diff --git a/include/groonga.h b/include/groonga.h index a9cceb107f..74b0c382eb 100644 --- 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 index ac5270e979..6e0880965d 100644 --- 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 @@ -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 index 9fc556c724..d9e975cc06 100644 --- 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 index c4668f2f12..9e209d2f0b 100644 --- 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 index 8cf178bc43..743240716a 100644 --- 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 index b7a954bb0a..30fbb8d25e 100644 --- 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 index 6f2aa2018e..0cd780a884 100644 --- 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 #include @@ -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 index f39939880b..0ab1510fcb 100644 --- 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 index f4e628de53..c13f6ae67d 100644 --- 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 @@ -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 index 3ec843c6e0..8276892650 100644 --- 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 @@ -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 index e8ac280a33..619c825e46 100644 --- 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 index 27908d9067..4a62666271 100644 --- 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 index 3671c084c7..394eecf96b 100644 --- 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 @@ -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 index 3fad4bd543..a25f87a3bb 100644 --- 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 index 0032a778c2..b1fb5c9584 100644 --- 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 index 6f9c589aff..6247afd251 100644 --- 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 @@ -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 */ diff --git a/include/groonga/thread.h b/include/groonga/thread.h index 011111f619..c7c8f80147 100644 --- a/include/groonga/thread.h +++ b/include/groonga/thread.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_THREAD_H -#define GROONGA_THREAD_H +#pragma once #ifdef __cplusplus extern "C" { @@ -38,5 +37,3 @@ GRN_API void grn_thread_set_set_limit_func(grn_thread_set_limit_func func, #ifdef __cplusplus } #endif - -#endif /* GROONGA_THREAD_H */ diff --git a/include/groonga/token.h b/include/groonga/token.h index 5aeaf0b436..20f9fe2735 100644 --- a/include/groonga/token.h +++ b/include/groonga/token.h @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - 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 @@ -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_TOKEN_H -#define GROONGA_TOKEN_H + +#pragma once #ifdef __cplusplus extern "C" { @@ -132,5 +132,3 @@ GRN_PLUGIN_EXPORT grn_rc grn_token_set_status(grn_ctx *ctx, #ifdef __cplusplus } /* extern "C" */ #endif /* __cplusplus */ - -#endif /* GROONGA_TOKEN_H */ diff --git a/include/groonga/token_filter.h b/include/groonga/token_filter.h index 9c5a3567b3..6b09add127 100644 --- a/include/groonga/token_filter.h +++ b/include/groonga/token_filter.h @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - 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 @@ -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_TOKEN_FILTER_H -#define GROONGA_TOKEN_FILTER_H + +#pragma once #include @@ -65,5 +65,3 @@ GRN_PLUGIN_EXPORT grn_rc grn_token_filter_register(grn_ctx *ctx, #ifdef __cplusplus } /* extern "C" */ #endif /* __cplusplus */ - -#endif /* GROONGA_TOKEN_FILTER_H */ diff --git a/include/groonga/tokenizer.h b/include/groonga/tokenizer.h index 8ad7f6757f..bdb1c41aa3 100644 --- a/include/groonga/tokenizer.h +++ b/include/groonga/tokenizer.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_TOKENIZER_H -#define GROONGA_TOKENIZER_H + +#pragma once #include #include @@ -258,5 +258,3 @@ GRN_PLUGIN_EXPORT grn_rc grn_tokenizer_register(grn_ctx *ctx, const char *plugin #ifdef __cplusplus } /* extern "C" */ #endif /* __cplusplus */ - -#endif /* GROONGA_TOKENIZER_H */ diff --git a/include/groonga/util.h b/include/groonga/util.h index 446cb88f8c..52997eaba1 100644 --- a/include/groonga/util.h +++ b/include/groonga/util.h @@ -1,5 +1,5 @@ /* - 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_UTIL_H -#define GROONGA_UTIL_H + +#pragma once #ifdef __cplusplus extern "C" { @@ -36,5 +36,3 @@ GRN_API void grn_p_ii_values(grn_ctx *ctx, grn_obj *obj); #ifdef __cplusplus } #endif - -#endif /* GROONGA_UTIL_H */ diff --git a/include/groonga/windows.h b/include/groonga/windows.h index 290b276300..1984a77329 100644 --- a/include/groonga/windows.h +++ b/include/groonga/windows.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_WINDOWS_H -#define GROONGA_WINDOWS_H +#pragma once #ifdef __cplusplus extern "C" { @@ -30,5 +29,3 @@ GRN_API const char *grn_windows_base_dir(void); #ifdef __cplusplus } #endif - -#endif /* GROONGA_WINDOWS_H */ diff --git a/include/groonga/windows_event_logger.h b/include/groonga/windows_event_logger.h index c5fd80af31..7fe6ea8f5c 100644 --- a/include/groonga/windows_event_logger.h +++ b/include/groonga/windows_event_logger.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_WINDOWS_EVENT_LOGGER_H -#define GROONGA_WINDOWS_EVENT_LOGGER_H +#pragma once #ifdef __cplusplus extern "C" { @@ -29,5 +28,3 @@ GRN_API grn_rc grn_windows_event_logger_set(grn_ctx *ctx, #ifdef __cplusplus } #endif - -#endif /* GROONGA_WINDOWS_EVENT_LOGGER_H */ diff --git a/lib/dat/array.hpp b/lib/dat/array.hpp index 5536552b36..ba297e81c4 100644 --- a/lib/dat/array.hpp +++ b/lib/dat/array.hpp @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2011 Brazil +/* + Copyright(C) 2011-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 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_DAT_ARRAY_HPP_ -#define GRN_DAT_ARRAY_HPP_ +#pragma once #include "dat.hpp" @@ -96,5 +96,3 @@ class GRN_DAT_API Array { } // namespace dat } // namespace grn - -#endif // GRN_DAT_ARRAY_HPP_ diff --git a/lib/dat/base.hpp b/lib/dat/base.hpp index 577e69ed62..6f80d7c29f 100644 --- a/lib/dat/base.hpp +++ b/lib/dat/base.hpp @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2011 Brazil +/* + Copyright(C) 2011-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 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_DAT_BASE_HPP_ -#define GRN_DAT_BASE_HPP_ +#pragma once #include "dat.hpp" @@ -65,5 +65,3 @@ class GRN_DAT_API Base { } // namespace dat } // namespace grn - -#endif // GRN_DAT_BASE_HPP_ diff --git a/lib/dat/block.hpp b/lib/dat/block.hpp index 4675083ece..4f1e78b0bf 100644 --- a/lib/dat/block.hpp +++ b/lib/dat/block.hpp @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2011 Brazil +/* + Copyright(C) 2011-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 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_DAT_BLOCK_HPP_ -#define GRN_DAT_BLOCK_HPP_ +#pragma once #include "dat.hpp" @@ -92,5 +92,3 @@ class GRN_DAT_API Block { } // namespace dat } // namespace grn - -#endif // GRN_DAT_BLOCK_HPP_ diff --git a/lib/dat/check.hpp b/lib/dat/check.hpp index f7e57874ca..27abbc9873 100644 --- a/lib/dat/check.hpp +++ b/lib/dat/check.hpp @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2011 Brazil +/* + Copyright(C) 2011-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 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_DAT_CHECK_HPP_ -#define GRN_DAT_CHECK_HPP_ +#pragma once #include "dat.hpp" @@ -147,5 +147,3 @@ class GRN_DAT_API Check { } // namespace dat } // namespace grn - -#endif // GRN_DAT_CHECK_HPP_ diff --git a/lib/dat/cursor-factory.hpp b/lib/dat/cursor-factory.hpp index c79ac4e89c..48a0ac5052 100644 --- a/lib/dat/cursor-factory.hpp +++ b/lib/dat/cursor-factory.hpp @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2011 Brazil +/* + Copyright(C) 2011-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 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_DAT_CURSOR_FACTORY_HPP_ -#define GRN_DAT_CURSOR_FACTORY_HPP_ +#pragma once #include "cursor.hpp" @@ -42,5 +42,3 @@ class GRN_DAT_API CursorFactory { } // namespace dat } // namespace grn - -#endif // GRN_DAT_CURSOR_FACTORY_HPP_ diff --git a/lib/dat/cursor.hpp b/lib/dat/cursor.hpp index 0a4887e1a7..2dfd98ff1d 100644 --- a/lib/dat/cursor.hpp +++ b/lib/dat/cursor.hpp @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2011 Brazil +/* + Copyright(C) 2011-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 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_DAT_CURSOR_HPP_ -#define GRN_DAT_CURSOR_HPP_ +#pragma once #include "key.hpp" @@ -44,5 +44,3 @@ class GRN_DAT_API Cursor { } // namespace dat } // namespace grn - -#endif // GRN_DAT_CURSOR_HPP_ diff --git a/lib/dat/dat.hpp b/lib/dat/dat.hpp index c941bf2552..f2e78b4c69 100644 --- a/lib/dat/dat.hpp +++ b/lib/dat/dat.hpp @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2011 Brazil +/* + Copyright(C) 2011-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 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_DAT_COMMON_HPP_ -#define GRN_DAT_COMMON_HPP_ +#pragma once #ifndef _MSC_VER # include @@ -245,5 +245,3 @@ typedef Error StatusError; } // namespace dat } // namespace grn - -#endif // GRN_DAT_COMMON_HPP_ diff --git a/lib/dat/entry.hpp b/lib/dat/entry.hpp index 0c0b3ad41a..47916e282f 100644 --- a/lib/dat/entry.hpp +++ b/lib/dat/entry.hpp @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2011 Brazil +/* + Copyright(C) 2011-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 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_DAT_ENTRY_HPP_ -#define GRN_DAT_ENTRY_HPP_ +#pragma once #include "dat.hpp" @@ -57,5 +57,3 @@ class GRN_DAT_API Entry { } // namespace dat } // namespace grn - -#endif // GRN_DAT_ENTRY_HPP_ diff --git a/lib/dat/file-impl.hpp b/lib/dat/file-impl.hpp index 245dbfc2ae..830cf77379 100644 --- a/lib/dat/file-impl.hpp +++ b/lib/dat/file-impl.hpp @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2011-2015 Brazil +/* + Copyright(C) 2011-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 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_DAT_FILE_IMPL_HPP_ -#define GRN_DAT_FILE_IMPL_HPP_ +#pragma once #ifdef WIN32 # include @@ -71,5 +71,3 @@ class FileImpl { } // namespace dat } // namespace grn - -#endif // GRN_DAT_FILE_IMPL_HPP_ diff --git a/lib/dat/file.hpp b/lib/dat/file.hpp index e7dda0e025..25d988d3e1 100644 --- a/lib/dat/file.hpp +++ b/lib/dat/file.hpp @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2011-2015 Brazil +/* + Copyright(C) 2011-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 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_DAT_FILE_HPP_ -#define GRN_DAT_FILE_HPP_ +#pragma once #include "dat.hpp" @@ -58,5 +58,3 @@ class GRN_DAT_API File { } // namespace dat } // namespace grn - -#endif // GRN_DAT_FILE_HPP_ diff --git a/lib/dat/header.hpp b/lib/dat/header.hpp index 4f383ac8bf..cf21307627 100644 --- a/lib/dat/header.hpp +++ b/lib/dat/header.hpp @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2011 Brazil +/* + Copyright(C) 2011-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 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_DAT_HPP_HEADER_HPP_ -#define GRN_DAT_HPP_HEADER_HPP_ +#pragma once #include "dat.hpp" @@ -177,5 +177,3 @@ class GRN_DAT_API Header { } // namespace dat } // namespace grn - -#endif // GRN_DAT_HPP_HEADER_HPP_ diff --git a/lib/dat/id-cursor.hpp b/lib/dat/id-cursor.hpp index aabd734e92..0e02b22508 100644 --- a/lib/dat/id-cursor.hpp +++ b/lib/dat/id-cursor.hpp @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2011 Brazil +/* + Copyright(C) 2011-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 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_DAT_ID_CURSOR_HPP_ -#define GRN_DAT_ID_CURSOR_HPP_ +#pragma once #include "cursor.hpp" @@ -81,5 +81,3 @@ class GRN_DAT_API IdCursor : public Cursor { } // namespace dat } // namespace grn - -#endif // GRN_DAT_ID_CURSOR_HPP_ diff --git a/lib/dat/key-cursor.hpp b/lib/dat/key-cursor.hpp index adce41c312..fcaa935509 100644 --- a/lib/dat/key-cursor.hpp +++ b/lib/dat/key-cursor.hpp @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2011 Brazil +/* + Copyright(C) 2011-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 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_DAT_KEY_CURSOR_HPP_ -#define GRN_DAT_KEY_CURSOR_HPP_ +#pragma once #include "cursor.hpp" #include "vector.hpp" @@ -86,5 +86,3 @@ class GRN_DAT_API KeyCursor : public Cursor { } // namespace dat } // namespace grn - -#endif // GRN_DAT_KEY_CURSOR_HPP_ diff --git a/lib/dat/key.hpp b/lib/dat/key.hpp index 21ae474cf4..95fb2b425a 100644 --- a/lib/dat/key.hpp +++ b/lib/dat/key.hpp @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2011 Brazil +/* + Copyright(C) 2011-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 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_DAT_KEY_HPP_ -#define GRN_DAT_KEY_HPP_ +#pragma once #include "string.hpp" @@ -108,5 +108,3 @@ class GRN_DAT_API Key { } // namespace dat } // namespace grn - -#endif // GRN_DAT_KEY_HPP_ diff --git a/lib/dat/node.hpp b/lib/dat/node.hpp index 45ae5089b3..7f22d67d35 100644 --- a/lib/dat/node.hpp +++ b/lib/dat/node.hpp @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2011 Brazil +/* + Copyright(C) 2011-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 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_DAT_NODE_HPP_ -#define GRN_DAT_NODE_HPP_ +#pragma once // See base.hpp and check.hpp for details. #include "base.hpp" @@ -125,5 +125,3 @@ class GRN_DAT_API Node { } // namespace dat } // namespace grn - -#endif // GRN_DAT_NODE_HPP_ diff --git a/lib/dat/predictive-cursor.hpp b/lib/dat/predictive-cursor.hpp index e4041ff22f..d02b778750 100644 --- a/lib/dat/predictive-cursor.hpp +++ b/lib/dat/predictive-cursor.hpp @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2011 Brazil +/* + Copyright(C) 2011-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 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_DAT_PREDICTIVE_CURSOR_HPP_ -#define GRN_DAT_PREDICTIVE_CURSOR_HPP_ +#pragma once #include "cursor.hpp" #include "vector.hpp" @@ -82,5 +82,3 @@ class GRN_DAT_API PredictiveCursor : public Cursor { } // namespace dat } // namespace grn - -#endif // GRN_DAT_PREDICTIVE_CURSOR_HPP_ diff --git a/lib/dat/prefix-cursor.hpp b/lib/dat/prefix-cursor.hpp index 7a84228cef..9d2a62666a 100644 --- a/lib/dat/prefix-cursor.hpp +++ b/lib/dat/prefix-cursor.hpp @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2011 Brazil +/* + Copyright(C) 2011-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 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_DAT_PREFIX_CURSOR_HPP_ -#define GRN_DAT_PREFIX_CURSOR_HPP_ +#pragma once #include "cursor.hpp" #include "vector.hpp" @@ -76,5 +76,3 @@ class GRN_DAT_API PrefixCursor : public Cursor { } // namespace dat } // namespace grn - -#endif // GRN_DAT_PREFIX_CURSOR_HPP_ diff --git a/lib/dat/string.hpp b/lib/dat/string.hpp index ecbb1e79d0..c6bee8641d 100644 --- a/lib/dat/string.hpp +++ b/lib/dat/string.hpp @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2011 Brazil +/* + Copyright(C) 2011-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 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_DAT_STRING_HPP_ -#define GRN_DAT_STRING_HPP_ +#pragma once #include "dat.hpp" @@ -171,5 +171,3 @@ inline bool operator>=(const String &lhs, const String &rhs) { } // namespace dat } // namespace grn - -#endif // GRN_DAT_STRING_HPP_ diff --git a/lib/dat/trie.hpp b/lib/dat/trie.hpp index 8a272bb794..d6e5b9c284 100644 --- a/lib/dat/trie.hpp +++ b/lib/dat/trie.hpp @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2011-2015 Brazil +/* + Copyright(C) 2011-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 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_DAT_TRIE_HPP_ -#define GRN_DAT_TRIE_HPP_ +#pragma once #include "array.hpp" #include "header.hpp" @@ -283,5 +283,3 @@ class GRN_DAT_API Trie { } // namespace dat } // namespace grn - -#endif // GRN_DAT_TRIE_HPP_ diff --git a/lib/dat/vector.hpp b/lib/dat/vector.hpp index 4f32c590e0..202203334a 100644 --- a/lib/dat/vector.hpp +++ b/lib/dat/vector.hpp @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2011 Brazil +/* + Copyright(C) 2011-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 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_DAT_VECTOR_HPP_ -#define GRN_DAT_VECTOR_HPP_ +#pragma once #include "dat.hpp" @@ -189,5 +189,3 @@ class GRN_DAT_API Vector { } // namespace dat } // namespace grn - -#endif // GRN_DAT_VECTOR_HPP_ diff --git a/lib/grn.h b/lib/grn.h index 621747fa8d..c180b08de8 100644 --- a/lib/grn.h +++ b/lib/grn.h @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* 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 @@ -16,8 +17,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_H -#define GRN_H +#pragma once #ifdef HAVE_CONFIG_H # include @@ -765,5 +765,3 @@ GRN_API void grn_sleep(uint32_t seconds); GRN_API void grn_nanosleep(uint64_t nanoseconds); #include - -#endif /* GRN_H */ diff --git a/lib/grn_com.h b/lib/grn_com.h index 203ed56c88..c1451b158c 100644 --- a/lib/grn_com.h +++ b/lib/grn_com.h @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2009-2012 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 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_COM_H -#define GRN_COM_H +#pragma once #include "grn.h" #include "grn_str.h" @@ -248,5 +248,3 @@ void grn_edge_dispatch(grn_ctx *ctx, grn_edge *edge, grn_obj *msg); #ifdef __cplusplus } #endif - -#endif /* GRN_COM_H */ diff --git a/lib/grn_ctx.h b/lib/grn_ctx.h index c45f3c5c3f..8cf968157f 100644 --- a/lib/grn_ctx.h +++ b/lib/grn_ctx.h @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - 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 GRN_CTX_H -#define GRN_CTX_H + +#pragma once #include "grn.h" #include "grn_error.h" @@ -614,5 +614,3 @@ grn_rc grn_db_init_builtin_procs(grn_ctx *ctx); #ifdef __cplusplus } #endif - -#endif /* GRN_CTX_H */ diff --git a/lib/grn_ctx_impl.h b/lib/grn_ctx_impl.h index 6670d18472..09df0ca3ab 100644 --- a/lib/grn_ctx_impl.h +++ b/lib/grn_ctx_impl.h @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - 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 GRN_CTX_IMPL_H -#define GRN_CTX_IMPL_H + +#pragma once #ifndef GRN_CTX_H # include "grn_ctx.h" @@ -203,5 +203,3 @@ struct _grn_ctx_impl { #ifdef __cplusplus } #endif - -#endif /* GRN_CTX_IMPL_H */ diff --git a/lib/grn_ctx_impl_mrb.h b/lib/grn_ctx_impl_mrb.h index 3e46d2e417..004fc6a841 100644 --- a/lib/grn_ctx_impl_mrb.h +++ b/lib/grn_ctx_impl_mrb.h @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2013-2015 Brazil + Copyright(C) 2013-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_CTX_IMPL_MRB_H -#define GRN_CTX_IMPL_MRB_H +#pragma once #include "grn.h" #include "grn_ctx.h" @@ -33,5 +32,3 @@ void grn_ctx_impl_mrb_fin(grn_ctx *ctx); #ifdef __cplusplus } #endif - -#endif /* GRN_CTX_IMPL_MRB_H */ diff --git a/lib/grn_dat.h b/lib/grn_dat.h index d3c768fa65..2d4ac2a848 100644 --- a/lib/grn_dat.h +++ b/lib/grn_dat.h @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2011-2015 Brazil +/* + Copyright(C) 2011-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,13 +15,10 @@ 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 GRN_DAT_H -#define GRN_DAT_H -#ifndef GRN_H -# include "grn.h" -#endif /* GRN_H */ +#pragma once +#include "grn.h" #include "grn_db.h" #ifdef __cplusplus @@ -84,5 +82,3 @@ GRN_API grn_rc grn_dat_flush(grn_ctx *ctx, grn_dat *dat); #ifdef __cplusplus } #endif - -#endif /* GRN_DAT_H */ diff --git a/lib/grn_db.h b/lib/grn_db.h index b26989a088..6bfa1cc122 100644 --- a/lib/grn_db.h +++ b/lib/grn_db.h @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* 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 @@ -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 GRN_DB_H -#define GRN_DB_H + +#pragma once #include "grn.h" #include "grn_ctx.h" @@ -441,5 +442,3 @@ grn_obj *grn_obj_default_set_value_hook(grn_ctx *ctx, #ifdef __cplusplus } #endif - -#endif /* GRN_DB_H */ diff --git a/lib/grn_error.h b/lib/grn_error.h index 65a059d54c..897ae50070 100644 --- a/lib/grn_error.h +++ b/lib/grn_error.h @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2013 Brazil + Copyright(C) 2013-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,12 +15,10 @@ 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 GRN_ERROR_H -#define GRN_ERROR_H -#ifndef GRN_H +#pragma once + #include "grn.h" -#endif /* GRN_H */ #ifdef __cplusplus extern "C" { @@ -34,5 +32,3 @@ GRN_API grn_rc grn_windows_error_code_to_rc(int error_code); #ifdef __cplusplus } #endif - -#endif /* GRN_ERROR_H */ diff --git a/lib/grn_expr.h b/lib/grn_expr.h index e5f6bb9478..7a0f3f0ba3 100644 --- a/lib/grn_expr.h +++ b/lib/grn_expr.h @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2013-2015 Brazil + Copyright(C) 2013-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_EXPR_H -#define GRN_EXPR_H +#pragma once #include "grn_db.h" @@ -81,6 +80,3 @@ grn_obj *grn_expr_alloc_const(grn_ctx *ctx, grn_obj *expr); #ifdef __cplusplus } #endif - -#endif /* GRN_EXPR_H */ - diff --git a/lib/grn_expr_code.h b/lib/grn_expr_code.h index a0fd680e7d..f33c532ee5 100644 --- a/lib/grn_expr_code.h +++ b/lib/grn_expr_code.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_EXPR_CODE_H -#define GRN_EXPR_CODE_H +#pragma once #include "grn_db.h" @@ -32,6 +31,3 @@ unsigned int grn_expr_code_n_used_codes(grn_ctx *ctx, #ifdef __cplusplus } #endif - -#endif /* GRN_EXPR_CODE_H */ - diff --git a/lib/grn_geo.h b/lib/grn_geo.h index 14e8d81e28..884287aeae 100644 --- a/lib/grn_geo.h +++ b/lib/grn_geo.h @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2009-2011 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,13 +15,10 @@ 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 GRN_GEO_H -#define GRN_GEO_H -#ifndef GRN_H -#include "grn.h" -#endif /* GRN_H */ +#pragma once +#include "grn.h" #include "grn_ii.h" #include "grn_db.h" @@ -200,5 +198,3 @@ double grn_geo_distance_ellipsoid_raw_wgs84(grn_ctx *ctx, #ifdef __cplusplus } #endif - -#endif /* GRN_GEO_H */ diff --git a/lib/grn_hash.h b/lib/grn_hash.h index d72ae0ff9a..62b725f198 100644 --- a/lib/grn_hash.h +++ b/lib/grn_hash.h @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* 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 @@ -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 GRN_HASH_H -#define GRN_HASH_H + +#pragma once #include "grn.h" #include "grn_ctx.h" @@ -375,5 +376,3 @@ void grn_hash_check(grn_ctx *ctx, grn_hash *hash); #ifdef __cplusplus } #endif - -#endif /* GRN_HASH_H */ diff --git a/lib/grn_ii.h b/lib/grn_ii.h index 06edf2b1a6..21e3fc73e9 100644 --- a/lib/grn_ii.h +++ b/lib/grn_ii.h @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* 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 @@ -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 GRN_II_H -#define GRN_II_H + +#pragma once /* "ii" is for inverted index */ @@ -170,5 +171,3 @@ grn_rc grn_ii_build(grn_ctx *ctx, grn_ii *ii, uint64_t sparsity); #ifdef __cplusplus } #endif - -#endif /* GRN_II_H */ diff --git a/lib/grn_index_column.h b/lib/grn_index_column.h index 9b094e1c70..afaed9c901 100644 --- a/lib/grn_index_column.h +++ b/lib/grn_index_column.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 GRN_INDEX_COLUMN_H -#define GRN_INDEX_COLUMN_H +#pragma once #include "grn_db.h" @@ -33,5 +32,3 @@ grn_rc grn_index_column_rebuild(grn_ctx *ctx, grn_obj *index_column); #ifdef __cplusplus } #endif - -#endif /* GRN_INDEX_COLUMN_H */ diff --git a/lib/grn_io.h b/lib/grn_io.h index 6de63bd172..ed162cec22 100644 --- a/lib/grn_io.h +++ b/lib/grn_io.h @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* 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 @@ -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 GRN_IO_H -#define GRN_IO_H + +#pragma once #include "grn.h" #include "grn_error.h" @@ -474,5 +475,3 @@ grn_rc grn_io_flush(grn_ctx *ctx, grn_io *io); #ifdef __cplusplus } #endif - -#endif /* GRN_IO_H */ diff --git a/lib/grn_logger.h b/lib/grn_logger.h index 95186ca107..ea0a85fb2e 100644 --- a/lib/grn_logger.h +++ b/lib/grn_logger.h @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - 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 GRN_LOGGER_H -#define GRN_LOGGER_H + +#pragma once #include "grn.h" @@ -33,5 +33,3 @@ void grn_query_logger_fin(grn_ctx *ctx); #ifdef __cplusplus } #endif - -#endif /* GRN_LOGGER_H */ diff --git a/lib/grn_mrb.h b/lib/grn_mrb.h index 3726cdcba2..f7bba8c4a1 100644 --- a/lib/grn_mrb.h +++ b/lib/grn_mrb.h @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2013-2014 Brazil + Copyright(C) 2013-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_MRB_H -#define GRN_MRB_H +#pragma once #include "grn.h" #include "grn_ctx.h" @@ -42,5 +41,3 @@ GRN_API const char *grn_mrb_get_system_ruby_scripts_dir(grn_ctx *ctx); #ifdef __cplusplus } #endif - -#endif /* GRN_MRB_H */ diff --git a/lib/grn_msgpack.h b/lib/grn_msgpack.h index db86987c08..c153d83bba 100644 --- a/lib/grn_msgpack.h +++ b/lib/grn_msgpack.h @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - 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 GRN_MSGPACK_H -#define GRN_MSGPACK_H + +#pragma once #ifdef GRN_WITH_MESSAGE_PACK # include @@ -44,5 +44,3 @@ typedef size_t msgpack_size_t; # define MSGPACK_OBJECT_FLOAT_VALUE(object) (object)->via.f64 # endif /* MSGPACK_VERSION_MAJOR < 1 */ #endif /* GRN_WITH_MESSAGE_PACK */ - -#endif /* GRN_MSGPACK_H */ diff --git a/lib/grn_normalizer.h b/lib/grn_normalizer.h index 8c7bfddf81..3afc9bcef0 100644 --- a/lib/grn_normalizer.h +++ b/lib/grn_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 GRN_NORMALIZER_H -#define GRN_NORMALIZER_H + +#pragma once #include "grn.h" #include "grn_ctx.h" @@ -40,5 +40,3 @@ grn_rc grn_db_init_builtin_normalizers(grn_ctx *ctx); #ifdef __cplusplus } #endif - -#endif /* GRN_NORMALIZER_H */ diff --git a/lib/grn_output.h b/lib/grn_output.h index c616061b46..758443ac57 100644 --- a/lib/grn_output.h +++ b/lib/grn_output.h @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2010-2012 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 @@ -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 GRN_OUTPUT_H -#define GRN_OUTPUT_H + +#pragma once #include "grn.h" #include "grn_ctx.h" @@ -102,5 +103,3 @@ grn_rc grn_output_format_set_columns(grn_ctx *ctx, grn_obj_format *format, #ifdef __cplusplus } #endif - -#endif /* GRN_OUTPUT_H */ diff --git a/lib/grn_pat.h b/lib/grn_pat.h index b8c7a3232e..6a2a433824 100644 --- a/lib/grn_pat.h +++ b/lib/grn_pat.h @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* 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 @@ -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 GRN_PAT_H -#define GRN_PAT_H + +#pragma once #include "grn.h" #include "grn_db.h" @@ -109,5 +110,3 @@ void grn_pat_cache_disable(grn_ctx *ctx, grn_pat *pat); #ifdef __cplusplus } #endif - -#endif /* GRN_PAT_H */ diff --git a/lib/grn_plugin.h b/lib/grn_plugin.h index 22749c634a..3e7b952884 100644 --- a/lib/grn_plugin.h +++ b/lib/grn_plugin.h @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2010-2013 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 @@ -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 GRN_PLUGIN_H -#define GRN_PLUGIN_H + +#pragma once #include "grn.h" #include "grn_ctx.h" @@ -59,5 +60,3 @@ void grn_plugin_ensure_registered(grn_ctx *ctx, grn_obj *proc); #ifdef __cplusplus } #endif - -#endif /* GRN_PLUGIN_H */ diff --git a/lib/grn_proc.h b/lib/grn_proc.h index b75d11079a..b4ed1b8855 100644 --- a/lib/grn_proc.h +++ b/lib/grn_proc.h @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* 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 @@ -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 GRN_PROC_H -#define GRN_PROC_H + +#pragma once #include "grn.h" @@ -31,5 +32,3 @@ void grn_db_init_builtin_query(grn_ctx *ctx); #ifdef __cplusplus } #endif - -#endif /* GRN_PROC_H */ diff --git a/lib/grn_report.h b/lib/grn_report.h index 43ea86219a..4211ec0439 100644 --- a/lib/grn_report.h +++ b/lib/grn_report.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_REPORT_H -#define GRN_REPORT_H +#pragma once #include "grn_ctx.h" @@ -35,5 +34,3 @@ void grn_report_index(grn_ctx *ctx, #ifdef __cplusplus } #endif - -#endif /* GRN_REPORT_H */ diff --git a/lib/grn_request_canceler.h b/lib/grn_request_canceler.h index 4c77ea5246..212605394e 100644 --- a/lib/grn_request_canceler.h +++ b/lib/grn_request_canceler.h @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - 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 GRN_REQUEST_CANCELER_H -#define GRN_REQUEST_CANCELER_H +#pragma once #include "grn.h" @@ -27,5 +26,3 @@ void grn_request_canceler_fin(void); #ifdef __cplusplus } #endif - -#endif /* GRN_REQUEST_CANCELER_H */ diff --git a/lib/grn_rset.h b/lib/grn_rset.h index b92e21162d..6a6a8b83fb 100644 --- a/lib/grn_rset.h +++ b/lib/grn_rset.h @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* 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 @@ -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 GRN_RSET_H -#define GRN_RSET_H + +#pragma once #include "grn.h" @@ -111,5 +112,3 @@ void grn_rset_recinfo_set_avg(grn_ctx *ctx, #ifdef __cplusplus } #endif - -#endif /* GRN_RSET_H */ diff --git a/lib/grn_scanner.h b/lib/grn_scanner.h index c511f489f3..617c2b89ab 100644 --- a/lib/grn_scanner.h +++ b/lib/grn_scanner.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_SCANNER_H -#define GRN_SCANNER_H +#pragma once #include "grn_expr.h" @@ -39,5 +38,3 @@ void grn_scanner_close(grn_ctx *ctx, grn_scanner *scanner); #ifdef __cplusplus } #endif - -#endif /* GRN_SCANNER_H */ diff --git a/lib/grn_scorer.h b/lib/grn_scorer.h index 05f982180d..438fd87abf 100644 --- a/lib/grn_scorer.h +++ b/lib/grn_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 GRN_SCORER_H -#define GRN_SCORER_H + +#pragma once #include "grn_ctx.h" #include "grn_db.h" @@ -47,5 +47,3 @@ struct _grn_scorer_matched_record { #ifdef __cplusplus } #endif - -#endif /* GRN_SCORER_H */ diff --git a/lib/grn_scorers.h b/lib/grn_scorers.h index ed6c18c211..4a6f1e255a 100644 --- a/lib/grn_scorers.h +++ b/lib/grn_scorers.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 GRN_SCORERS_H -#define GRN_SCORERS_H + +#pragma once #include "grn_ctx.h" @@ -29,5 +29,3 @@ grn_rc grn_db_init_builtin_scorers(grn_ctx *ctx); #ifdef __cplusplus } #endif - -#endif /* GRN_SCORERS_H */ diff --git a/lib/grn_snip.h b/lib/grn_snip.h index 7c123e0c5f..023a1d1b2b 100644 --- a/lib/grn_snip.h +++ b/lib/grn_snip.h @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* 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 @@ -14,17 +15,11 @@ 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 GRN_SNIP_H -#define GRN_SNIP_H -#ifndef GRN_H -#include "grn.h" -#endif /* GRN_H */ +#pragma once -#ifndef GRN_STR_H +#include "grn.h" #include "grn_str.h" -#endif /* GRN_STR_H */ - #include "grn_db.h" #define ASIZE 256U @@ -128,5 +123,3 @@ void grn_bm_tunedbm(grn_ctx *ctx, snip_cond *cond, grn_obj *string, int flags); #ifdef __cplusplus } #endif - -#endif /* GRN_SNIP_H */ diff --git a/lib/grn_store.h b/lib/grn_store.h index b1580c79ef..a42e811f1e 100644 --- a/lib/grn_store.h +++ b/lib/grn_store.h @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2009-2012 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 GRN_STORE_H -#define GRN_STORE_H + +#pragma once #include "grn.h" #include "grn_ctx.h" @@ -212,5 +213,3 @@ grn_rc grn_vgram_buf_close(grn_vgram_buf *b); #ifdef __cplusplus } #endif - -#endif /* GRN_STORE_H */ diff --git a/lib/grn_str.h b/lib/grn_str.h index e6fab611cc..d856f2c095 100644 --- a/lib/grn_str.h +++ b/lib/grn_str.h @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2009-2012 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 GRN_STR_H -#define GRN_STR_H + +#pragma once #include "grn.h" #include @@ -121,5 +122,3 @@ grn_bool grn_bulk_is_zero(grn_ctx *ctx, grn_obj *obj); #ifdef __cplusplus } #endif - -#endif /* GRN_STR_H */ diff --git a/lib/grn_string.h b/lib/grn_string.h index bb5905c84f..95454ef0e8 100644 --- a/lib/grn_string.h +++ b/lib/grn_string.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 @@ -17,24 +17,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_STRING_H -#define GRN_STRING_H +#pragma once -#ifndef GRN_H -# include "grn.h" -#endif /* GRN_H */ - -#ifndef GRN_CTX_H -# include "grn_ctx.h" -#endif /* GRN_CTX_H */ - -#ifndef GRN_DB_H -# include "grn_db.h" -#endif /* GRN_DB_H */ - -#ifndef GRN_STR_H -# include "grn_str.h" -#endif /* GRN_STR_H */ +#include "grn.h" +#include "grn_ctx.h" +#include "grn_db.h" +#include "grn_str.h" #ifdef __cplusplus extern "C" { @@ -61,5 +49,3 @@ grn_rc grn_string_inspect(grn_ctx *ctx, grn_obj *buffer, grn_obj *string); #ifdef __cplusplus } #endif - -#endif /* GRN_STRING_H */ diff --git a/lib/grn_token_cursor.h b/lib/grn_token_cursor.h index fec6222441..cbb4527644 100644 --- a/lib/grn_token_cursor.h +++ b/lib/grn_token_cursor.h @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* 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 @@ -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 GRN_TOKEN_CURSOR_H -#define GRN_TOKEN_CURSOR_H + +#pragma once #include "grn_ctx.h" #include "grn_db.h" @@ -75,5 +76,3 @@ GRN_API grn_rc grn_token_cursor_close(grn_ctx *ctx, grn_token_cursor *token_curs #ifdef __cplusplus } #endif - -#endif /* GRN_TOKEN_CURSOR_H */ diff --git a/lib/grn_tokenizers.h b/lib/grn_tokenizers.h index fb85fb76a4..d52bbbb63e 100644 --- a/lib/grn_tokenizers.h +++ b/lib/grn_tokenizers.h @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* 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 @@ -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 GRN_TOKENIZERS_H -#define GRN_TOKENIZERS_H + +#pragma once #include "grn_ctx.h" @@ -34,5 +35,3 @@ grn_rc grn_db_init_builtin_tokenizers(grn_ctx *ctx); #ifdef __cplusplus } #endif - -#endif /* GRN_TOKENIZERS_H */ diff --git a/lib/grn_ts.h b/lib/grn_ts.h index 37d30461a0..d6939646e5 100644 --- a/lib/grn_ts.h +++ b/lib/grn_ts.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_TS_H -#define GRN_TS_H +#pragma once #include "grn.h" @@ -47,5 +46,3 @@ grn_rc grn_ts_select(grn_ctx *ctx, grn_obj *table, #ifdef __cplusplus } #endif - -#endif /* GRN_TS_H */ diff --git a/lib/grn_util.h b/lib/grn_util.h index 752e4d488b..cd7123c52e 100644 --- a/lib/grn_util.h +++ b/lib/grn_util.h @@ -1,5 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ -/* Copyright(C) 2010-2015 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 @@ -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 GRN_UTIL_H -#define GRN_UTIL_H + +#pragma once #include "grn.h" #include "grn_ctx.h" @@ -38,5 +39,3 @@ GRN_API UINT grn_windows_encoding_to_code_page(grn_encoding encoding); #ifdef __cplusplus } #endif - -#endif /* GRN_UTIL_H */ diff --git a/lib/mrb/mrb_accessor.h b/lib/mrb/mrb_accessor.h index 7b27e6375e..f8aca1e870 100644 --- a/lib/mrb/mrb_accessor.h +++ b/lib/mrb/mrb_accessor.h @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2013-2014 Brazil + Copyright(C) 2013-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_MRB_ACCESSOR_H -#define GRN_MRB_ACCESSOR_H +#pragma once #include "../grn_ctx.h" #include "../grn_db.h" @@ -32,4 +31,3 @@ void grn_mrb_accessor_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_ACCESSOR_H */ diff --git a/lib/mrb/mrb_array.h b/lib/mrb/mrb_array.h index 062281684e..39e8f5f81c 100644 --- a/lib/mrb/mrb_array.h +++ b/lib/mrb/mrb_array.h @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - 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 GRN_MRB_ARRAY_H -#define GRN_MRB_ARRAY_H +#pragma once #include "../grn_ctx.h" @@ -31,4 +30,3 @@ void grn_mrb_array_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_ARRAY_H */ diff --git a/lib/mrb/mrb_bulk.h b/lib/mrb/mrb_bulk.h index dd1f46fb84..b351a78ce8 100644 --- a/lib/mrb/mrb_bulk.h +++ b/lib/mrb/mrb_bulk.h @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - 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 @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_MRB_BULK_H -#define GRN_MRB_BULK_H +#pragma once #include "../grn_ctx.h" #include "../grn_db.h" @@ -40,5 +39,3 @@ grn_bool grn_mrb_bulk_cast(mrb_state *mrb, #ifdef __cplusplus } #endif - -#endif /* GRN_MRB_BULK_H */ diff --git a/lib/mrb/mrb_cache.h b/lib/mrb/mrb_cache.h index dc18c6e646..0eb7963b2b 100644 --- a/lib/mrb/mrb_cache.h +++ b/lib/mrb/mrb_cache.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_MRB_CACHE_H -#define GRN_MRB_CACHE_H +#pragma once #include "../grn_ctx.h" #include "../grn_db.h" @@ -32,4 +31,3 @@ void grn_mrb_cache_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_CACHE_H */ diff --git a/lib/mrb/mrb_column.h b/lib/mrb/mrb_column.h index abb99915fa..c692e76f58 100644 --- a/lib/mrb/mrb_column.h +++ b/lib/mrb/mrb_column.h @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2013 Brazil + Copyright(C) 2013-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_MRB_COLUMN_H -#define GRN_MRB_COLUMN_H +#pragma once #include "../grn_ctx.h" @@ -31,4 +30,3 @@ void grn_mrb_column_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_COLUMN_H */ diff --git a/lib/mrb/mrb_command.h b/lib/mrb/mrb_command.h index 2b899df3a6..6bbe4830a8 100644 --- a/lib/mrb/mrb_command.h +++ b/lib/mrb/mrb_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 @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_MRB_COMMAND_H -#define GRN_MRB_COMMAND_H +#pragma once #include "../grn_ctx.h" @@ -33,4 +32,3 @@ mrb_value grn_mrb_command_instantiate(grn_ctx *ctx, grn_obj *command); } #endif -#endif /* GRN_MRB_COMMAND_H */ diff --git a/lib/mrb/mrb_command_input.h b/lib/mrb/mrb_command_input.h index a4eb09779d..074912d929 100644 --- a/lib/mrb/mrb_command_input.h +++ b/lib/mrb/mrb_command_input.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_MRB_COMMAND_INPUT_H -#define GRN_MRB_COMMAND_INPUT_H +#pragma once #include "../grn_ctx.h" @@ -31,4 +30,3 @@ void grn_mrb_command_input_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_COMMAND_INPUT_H */ diff --git a/lib/mrb/mrb_command_version.h b/lib/mrb/mrb_command_version.h index 655eb80bd0..556964a7b7 100644 --- a/lib/mrb/mrb_command_version.h +++ b/lib/mrb/mrb_command_version.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_MRB_COMMAND_VERSION_H -#define GRN_MRB_COMMAND_VERSION_H +#pragma once #include "../grn_ctx.h" @@ -31,4 +30,3 @@ void grn_mrb_command_version_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_COMMAND_VERSION_H */ diff --git a/lib/mrb/mrb_conf.h b/lib/mrb/mrb_conf.h index 3d39bc43c6..8e9c2e3eeb 100644 --- a/lib/mrb/mrb_conf.h +++ b/lib/mrb/mrb_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_MRB_CONF_H -#define GRN_MRB_CONF_H +#pragma once #include "../grn_ctx.h" @@ -30,5 +29,3 @@ void grn_mrb_conf_init(grn_ctx *ctx); #ifdef __cplusplus } #endif - -#endif /* GRN_MRB_CONF_H */ diff --git a/lib/mrb/mrb_content_type.h b/lib/mrb/mrb_content_type.h index 46103ff1a6..ed0b999a72 100644 --- a/lib/mrb/mrb_content_type.h +++ b/lib/mrb/mrb_content_type.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_MRB_CONTENT_TYPE_H -#define GRN_MRB_CONTENT_TYPE_H +#pragma once #include "../grn_ctx.h" @@ -31,4 +30,3 @@ void grn_mrb_content_type_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_CONTENT_TYPE_H */ diff --git a/lib/mrb/mrb_converter.h b/lib/mrb/mrb_converter.h index f528120dc3..27fe455fc6 100644 --- a/lib/mrb/mrb_converter.h +++ b/lib/mrb/mrb_converter.h @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2013 Brazil + Copyright(C) 2013-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_MRB_CONVERTER_H -#define GRN_MRB_CONVERTER_H +#pragma once #include "../grn_ctx.h" @@ -60,5 +59,3 @@ grn_id grn_mrb_value_to_grn_type(mrb_state *mrb, mrb_value value); #ifdef __cplusplus } #endif - -#endif /* GRN_MRB_CONVERTER_H */ diff --git a/lib/mrb/mrb_ctx.h b/lib/mrb/mrb_ctx.h index aa527bfec5..b94128292a 100644 --- a/lib/mrb/mrb_ctx.h +++ b/lib/mrb/mrb_ctx.h @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2013 Brazil + Copyright(C) 2013-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_MRB_CTX_H -#define GRN_MRB_CTX_H +#pragma once #include "../grn_ctx.h" @@ -32,4 +31,3 @@ void grn_mrb_ctx_check(mrb_state *mrb); } #endif -#endif /* GRN_MRB_CTX_H */ diff --git a/lib/mrb/mrb_database.h b/lib/mrb/mrb_database.h index fd319c55fd..7601cddfc9 100644 --- a/lib/mrb/mrb_database.h +++ b/lib/mrb/mrb_database.h @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - 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 GRN_MRB_DATABASE_H -#define GRN_MRB_DATABASE_H +#pragma once #include "../grn_ctx.h" @@ -31,4 +30,3 @@ void grn_mrb_database_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_DATABASE_H */ diff --git a/lib/mrb/mrb_double_array_trie.h b/lib/mrb/mrb_double_array_trie.h index a69a94e556..a9109a4997 100644 --- a/lib/mrb/mrb_double_array_trie.h +++ b/lib/mrb/mrb_double_array_trie.h @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - 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 GRN_MRB_DOUBLE_ARRAY_TRIE_H -#define GRN_MRB_DOUBLE_ARRAY_TRIE_H +#pragma once #include "../grn_ctx.h" @@ -31,4 +30,3 @@ void grn_mrb_double_array_trie_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_DOUBLE_ARRAY_TRIE_H */ diff --git a/lib/mrb/mrb_error.h b/lib/mrb/mrb_error.h index c68c58fa27..e68805076b 100644 --- a/lib/mrb/mrb_error.h +++ b/lib/mrb/mrb_error.h @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - 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 GRN_MRB_ERROR_H -#define GRN_MRB_ERROR_H +#pragma once #include "../grn_ctx.h" @@ -31,4 +30,3 @@ void grn_mrb_error_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_ERROR_H */ diff --git a/lib/mrb/mrb_expr.h b/lib/mrb/mrb_expr.h index 85c65e3c21..14a5f975d3 100644 --- a/lib/mrb/mrb_expr.h +++ b/lib/mrb/mrb_expr.h @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2013-2015 Brazil + Copyright(C) 2013-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_MRB_EXPR_H -#define GRN_MRB_EXPR_H +#pragma once #include "../grn_ctx.h" #include "../grn_expr.h" @@ -42,4 +41,3 @@ unsigned int grn_mrb_expr_estimate_size(grn_ctx *ctx, } #endif -#endif /* GRN_MRB_EXPR_H */ diff --git a/lib/mrb/mrb_fixed_size_column.h b/lib/mrb/mrb_fixed_size_column.h index 1037716c9f..95d8f507a7 100644 --- a/lib/mrb/mrb_fixed_size_column.h +++ b/lib/mrb/mrb_fixed_size_column.h @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2013 Brazil + Copyright(C) 2013-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_MRB_FIXED_SIZE_COLUMN_H -#define GRN_MRB_FIXED_SIZE_COLUMN_H +#pragma once #include "../grn_ctx.h" @@ -31,4 +30,3 @@ void grn_mrb_fixed_size_column_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_FIXED_SIZE_COLUMN_H */ diff --git a/lib/mrb/mrb_hash_table.h b/lib/mrb/mrb_hash_table.h index 223267b47d..0fc40b2ba9 100644 --- a/lib/mrb/mrb_hash_table.h +++ b/lib/mrb/mrb_hash_table.h @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - 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 GRN_MRB_HASH_TABLE_H -#define GRN_MRB_HASH_TABLE_H +#pragma once #include "../grn_ctx.h" @@ -31,4 +30,3 @@ void grn_mrb_hash_table_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_HASH_TABLE_H */ diff --git a/lib/mrb/mrb_id.h b/lib/mrb/mrb_id.h index fcfd80384b..ff277340c4 100644 --- a/lib/mrb/mrb_id.h +++ b/lib/mrb/mrb_id.h @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - 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 GRN_MRB_ID_H -#define GRN_MRB_ID_H +#pragma once #include "../grn_ctx.h" @@ -31,4 +30,3 @@ void grn_mrb_id_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_ID_H */ diff --git a/lib/mrb/mrb_index_column.h b/lib/mrb/mrb_index_column.h index 307448fd4c..0aa29eea8e 100644 --- a/lib/mrb/mrb_index_column.h +++ b/lib/mrb/mrb_index_column.h @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - 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 GRN_MRB_INDEX_COLUMN_H -#define GRN_MRB_INDEX_COLUMN_H +#pragma once #include "../grn_ctx.h" @@ -31,4 +30,3 @@ void grn_mrb_index_column_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_INDEX_COLUMN_H */ diff --git a/lib/mrb/mrb_index_cursor.h b/lib/mrb/mrb_index_cursor.h index afbad53db9..0c9d7b5495 100644 --- a/lib/mrb/mrb_index_cursor.h +++ b/lib/mrb/mrb_index_cursor.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_MRB_INDEX_CURSOR_H -#define GRN_MRB_INDEX_CURSOR_H +#pragma once #include "../grn_ctx.h" @@ -31,4 +30,3 @@ void grn_mrb_index_cursor_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_INDEX_CURSOR_H */ diff --git a/lib/mrb/mrb_logger.h b/lib/mrb/mrb_logger.h index 358313b7ff..c6a1ede9df 100644 --- a/lib/mrb/mrb_logger.h +++ b/lib/mrb/mrb_logger.h @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - 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 GRN_MRB_LOGGER_H -#define GRN_MRB_LOGGER_H +#pragma once #include "../grn_ctx.h" @@ -31,4 +30,3 @@ void grn_mrb_logger_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_LOGGER_H */ diff --git a/lib/mrb/mrb_object.h b/lib/mrb/mrb_object.h index 82468bd015..0eebe54771 100644 --- a/lib/mrb/mrb_object.h +++ b/lib/mrb/mrb_object.h @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2013-2014 Brazil + Copyright(C) 2013-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_MRB_OBJECT_H -#define GRN_MRB_OBJECT_H +#pragma once #include "../grn_ctx.h" @@ -33,4 +32,3 @@ mrb_value grn_mrb_object_inspect(mrb_state *mrb, mrb_value self); } #endif -#endif /* GRN_MRB_OBJECT_H */ diff --git a/lib/mrb/mrb_object_flags.h b/lib/mrb/mrb_object_flags.h index 60c8222707..59e5680ea2 100644 --- a/lib/mrb/mrb_object_flags.h +++ b/lib/mrb/mrb_object_flags.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_MRB_OBJECT_FLAGS_H -#define GRN_MRB_OBJECT_FLAGS_H +#pragma once #include "../grn_ctx.h" @@ -31,4 +30,3 @@ void grn_mrb_object_flags_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_OBJECT_FLAGS_H */ diff --git a/lib/mrb/mrb_operator.h b/lib/mrb/mrb_operator.h index b76c498344..adbb3e24b5 100644 --- a/lib/mrb/mrb_operator.h +++ b/lib/mrb/mrb_operator.h @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - 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 @@ -16,8 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GRN_MRB_OPERATOR_H -#define GRN_MRB_OPERATOR_H +#pragma once #include "../grn_ctx.h" @@ -33,4 +32,3 @@ grn_operator grn_mrb_value_to_operator(mrb_state *mrb, mrb_value mrb_op); } #endif -#endif /* GRN_MRB_OPERATOR_H */ diff --git a/lib/mrb/mrb_options.h b/lib/mrb/mrb_options.h index 1aa547d3be..1523f05e2d 100644 --- a/lib/mrb/mrb_options.h +++ b/lib/mrb/mrb_options.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_MRB_OPTIONS_H -#define GRN_MRB_OPTIONS_H +#pragma once #include "../grn_ctx.h" @@ -37,4 +36,3 @@ mrb_value grn_mrb_options_get_static(mrb_state *mrb, } #endif -#endif /* GRN_MRB_OPTIONS_H */ diff --git a/lib/mrb/mrb_patricia_trie.h b/lib/mrb/mrb_patricia_trie.h index f281b25969..9a34bc2ae5 100644 --- a/lib/mrb/mrb_patricia_trie.h +++ b/lib/mrb/mrb_patricia_trie.h @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - 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 GRN_MRB_PATRICIA_TRIE_H -#define GRN_MRB_PATRICIA_TRIE_H +#pragma once #include "../grn_ctx.h" @@ -31,4 +30,3 @@ void grn_mrb_patricia_trie_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_PATRICIA_TRIE_H */ diff --git a/lib/mrb/mrb_procedure.h b/lib/mrb/mrb_procedure.h index 36bd10fdab..32135335a7 100644 --- a/lib/mrb/mrb_procedure.h +++ b/lib/mrb/mrb_procedure.h @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - 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 GRN_MRB_PROCEDURE_H -#define GRN_MRB_PROCEDURE_H +#pragma once #include "../grn_ctx.h" @@ -31,4 +30,3 @@ void grn_mrb_procedure_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_PROCEDURE_H */ diff --git a/lib/mrb/mrb_query_logger.h b/lib/mrb/mrb_query_logger.h index 41a7e2811e..8293f39932 100644 --- a/lib/mrb/mrb_query_logger.h +++ b/lib/mrb/mrb_query_logger.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_MRB_QUERY_LOGGER_H -#define GRN_MRB_QUERY_LOGGER_H +#pragma once #include "../grn_ctx.h" @@ -31,4 +30,3 @@ void grn_mrb_query_logger_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_QUERY_LOGGER_H */ diff --git a/lib/mrb/mrb_record.h b/lib/mrb/mrb_record.h index 3a7eccb344..ad6e01d910 100644 --- a/lib/mrb/mrb_record.h +++ b/lib/mrb/mrb_record.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_MRB_RECORD_H -#define GRN_MRB_RECORD_H +#pragma once #include "../grn_ctx.h" @@ -30,5 +29,3 @@ void grn_mrb_record_init(grn_ctx *ctx); #ifdef __cplusplus } #endif - -#endif /* GRN_MRB_RECORD_H */ diff --git a/lib/mrb/mrb_table.h b/lib/mrb/mrb_table.h index 000088fcf4..3af173aa31 100644 --- a/lib/mrb/mrb_table.h +++ b/lib/mrb/mrb_table.h @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - 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 GRN_MRB_TABLE_H -#define GRN_MRB_TABLE_H +#pragma once #include "../grn_ctx.h" @@ -31,4 +30,3 @@ void grn_mrb_table_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_TABLE_H */ diff --git a/lib/mrb/mrb_table_cursor.h b/lib/mrb/mrb_table_cursor.h index f05ab0977a..6d3e2c4bef 100644 --- a/lib/mrb/mrb_table_cursor.h +++ b/lib/mrb/mrb_table_cursor.h @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - 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 GRN_MRB_TABLE_CURSOR_H -#define GRN_MRB_TABLE_CURSOR_H +#pragma once #include "../grn_ctx.h" @@ -31,4 +30,3 @@ void grn_mrb_table_cursor_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_TABLE_CURSOR_H */ diff --git a/lib/mrb/mrb_table_cursor_flags.h b/lib/mrb/mrb_table_cursor_flags.h index f336cde932..058de5ee6a 100644 --- a/lib/mrb/mrb_table_cursor_flags.h +++ b/lib/mrb/mrb_table_cursor_flags.h @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - 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 GRN_MRB_TABLE_CURSOR_FLAGS_H -#define GRN_MRB_TABLE_CURSOR_FLAGS_H +#pragma once #include "../grn_ctx.h" @@ -31,4 +30,3 @@ void grn_mrb_table_cursor_flags_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_TABLE_CURSOR_FLAGS_H */ diff --git a/lib/mrb/mrb_table_group_flags.h b/lib/mrb/mrb_table_group_flags.h index fda2a9be82..1c80df39dc 100644 --- a/lib/mrb/mrb_table_group_flags.h +++ b/lib/mrb/mrb_table_group_flags.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_MRB_TABLE_GROUP_FLAGS_H -#define GRN_MRB_TABLE_GROUP_FLAGS_H +#pragma once #include "../grn_ctx.h" @@ -31,4 +30,3 @@ void grn_mrb_table_group_flags_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_TABLE_GROUP_FLAGS_H */ diff --git a/lib/mrb/mrb_table_group_result.h b/lib/mrb/mrb_table_group_result.h index cc3c70ff3b..87615ebdc7 100644 --- a/lib/mrb/mrb_table_group_result.h +++ b/lib/mrb/mrb_table_group_result.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_MRB_TABLE_GROUP_RESULT_H -#define GRN_MRB_TABLE_GROUP_RESULT_H +#pragma once #include "../grn_ctx.h" @@ -30,5 +29,3 @@ void grn_mrb_table_group_result_init(grn_ctx *ctx); #ifdef __cplusplus } #endif - -#endif /* GRN_MRB_TABLE_GROUP_RESULT_H */ diff --git a/lib/mrb/mrb_table_sort_flags.h b/lib/mrb/mrb_table_sort_flags.h index 0b5c40b999..a8e35f4952 100644 --- a/lib/mrb/mrb_table_sort_flags.h +++ b/lib/mrb/mrb_table_sort_flags.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_MRB_TABLE_SORT_FLAGS_H -#define GRN_MRB_TABLE_SORT_FLAGS_H +#pragma once #include "../grn_ctx.h" @@ -30,5 +29,3 @@ void grn_mrb_table_sort_flags_init(grn_ctx *ctx); #ifdef __cplusplus } #endif - -#endif /* GRN_MRB_TABLE_SORT_FLAGS_H */ diff --git a/lib/mrb/mrb_table_sort_key.h b/lib/mrb/mrb_table_sort_key.h index 1d56bcd631..9825ca80c6 100644 --- a/lib/mrb/mrb_table_sort_key.h +++ b/lib/mrb/mrb_table_sort_key.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_MRB_TABLE_SORT_KEY_H -#define GRN_MRB_TABLE_SORT_KEY_H +#pragma once #include "../grn_ctx.h" @@ -31,4 +30,3 @@ void grn_mrb_table_sort_key_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_TABLE_SORT_KEY_H */ diff --git a/lib/mrb/mrb_type.h b/lib/mrb/mrb_type.h index f86167443a..17b4394469 100644 --- a/lib/mrb/mrb_type.h +++ b/lib/mrb/mrb_type.h @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - 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 GRN_MRB_TYPE_H -#define GRN_MRB_TYPE_H +#pragma once #include "../grn_ctx.h" @@ -31,4 +30,3 @@ void grn_mrb_type_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_TYPE_H */ diff --git a/lib/mrb/mrb_variable_size_column.h b/lib/mrb/mrb_variable_size_column.h index c904e7023b..16d5403a95 100644 --- a/lib/mrb/mrb_variable_size_column.h +++ b/lib/mrb/mrb_variable_size_column.h @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - 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 GRN_MRB_VARIABLE_SIZE_COLUMN_H -#define GRN_MRB_VARIABLE_SIZE_COLUMN_H +#pragma once #include "../grn_ctx.h" @@ -31,4 +30,3 @@ void grn_mrb_variable_size_column_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_VARIABLE_SIZE_COLUMN_H */ diff --git a/lib/mrb/mrb_void.h b/lib/mrb/mrb_void.h index 474d7804c7..3169334fe2 100644 --- a/lib/mrb/mrb_void.h +++ b/lib/mrb/mrb_void.h @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - 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 GRN_MRB_VOID_H -#define GRN_MRB_VOID_H +#pragma once #include "../grn_ctx.h" @@ -31,4 +30,3 @@ void grn_mrb_void_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_VOID_H */ diff --git a/lib/mrb/mrb_writer.h b/lib/mrb/mrb_writer.h index a6b4a6b3a7..a4de02615e 100644 --- a/lib/mrb/mrb_writer.h +++ b/lib/mrb/mrb_writer.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_MRB_WRITER_H -#define GRN_MRB_WRITER_H +#pragma once #include "../grn_ctx.h" @@ -31,4 +30,3 @@ void grn_mrb_writer_init(grn_ctx *ctx); } #endif -#endif /* GRN_MRB_WRITER_H */ diff --git a/lib/ts/ts_buf.h b/lib/ts/ts_buf.h index c9c86ffa50..64caec933b 100644 --- a/lib/ts/ts_buf.h +++ b/lib/ts/ts_buf.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_TS_BUF_H -#define GRN_TS_BUF_H +#pragma once #include "../grn.h" @@ -110,4 +109,3 @@ grn_rc grn_ts_rbuf_resize(grn_ctx *ctx, grn_ts_rbuf *rbuf, } #endif -#endif /* GRN_TS_BUF_H */ diff --git a/lib/ts/ts_cursor.h b/lib/ts/ts_cursor.h index 65bc0fdb1f..f05aa7518d 100644 --- a/lib/ts/ts_cursor.h +++ b/lib/ts/ts_cursor.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_TS_CURSOR_H -#define GRN_TS_CURSOR_H +#pragma once #include "../grn.h" @@ -58,4 +57,3 @@ grn_rc grn_ts_cursor_read(grn_ctx *ctx, grn_ts_cursor *cursor, } #endif -#endif /* GRN_TS_CURSOR_H */ diff --git a/lib/ts/ts_expr.h b/lib/ts/ts_expr.h index d32ce9fa1e..be370e8b56 100644 --- a/lib/ts/ts_expr.h +++ b/lib/ts/ts_expr.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_TS_EXPR_H -#define GRN_TS_EXPR_H +#pragma once #include "../grn.h" @@ -86,4 +85,3 @@ grn_rc grn_ts_expr_adjust(grn_ctx *ctx, grn_ts_expr *expr, } #endif -#endif /* GRN_TS_EXPR_H */ diff --git a/lib/ts/ts_expr_builder.h b/lib/ts/ts_expr_builder.h index 35669be0bf..2e2eb436db 100644 --- a/lib/ts/ts_expr_builder.h +++ b/lib/ts/ts_expr_builder.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_TS_EXPR_BUILDER_H -#define GRN_TS_EXPR_BUILDER_H +#pragma once #include "../grn.h" @@ -127,4 +126,3 @@ grn_rc grn_ts_expr_builder_end_subexpr(grn_ctx *ctx, } #endif -#endif /* GRN_TS_EXPR_BUILDER_H */ diff --git a/lib/ts/ts_expr_node.h b/lib/ts/ts_expr_node.h index 207317709d..40e7022f10 100644 --- a/lib/ts/ts_expr_node.h +++ b/lib/ts/ts_expr_node.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_TS_EXPR_NODE_H -#define GRN_TS_EXPR_NODE_H +#pragma once #include "../grn.h" @@ -127,4 +126,3 @@ grn_rc grn_ts_expr_node_adjust(grn_ctx *ctx, grn_ts_expr_node *node, } #endif -#endif /* GRN_TS_EXPR_NODE_H */ diff --git a/lib/ts/ts_expr_parser.h b/lib/ts/ts_expr_parser.h index 9c9122e591..1023356e82 100644 --- a/lib/ts/ts_expr_parser.h +++ b/lib/ts/ts_expr_parser.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_TS_EXPR_PARSER_H -#define GRN_TS_EXPR_PARSER_H +#pragma once #include "ts_expr.h" #include "ts_expr_builder.h" @@ -106,4 +105,3 @@ grn_rc grn_ts_expr_parser_split(grn_ctx *ctx, grn_ts_expr_parser *parser, } #endif -#endif /* GRN_TS_EXPR_PARSER_H */ diff --git a/lib/ts/ts_log.h b/lib/ts/ts_log.h index b671a3498b..7619d60543 100644 --- a/lib/ts/ts_log.h +++ b/lib/ts/ts_log.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_TS_LOG_H -#define GRN_TS_LOG_H +#pragma once #include "../grn.h" #include "../grn_ctx.h" @@ -45,4 +44,3 @@ extern "C" { } #endif -#endif /* GRN_TS_LOG_H */ diff --git a/lib/ts/ts_op.h b/lib/ts/ts_op.h index 8e1641570a..3bdfcf43f8 100644 --- a/lib/ts/ts_op.h +++ b/lib/ts/ts_op.h @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 2 -*- */ /* - Copyright(C) 2015-2016 Brazil + Copyright(C) 2015-2016-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_TS_OP_H -#define GRN_TS_OP_H +#pragma once #include "../grn.h" @@ -86,4 +85,3 @@ grn_ts_op_precedence grn_ts_op_get_precedence(grn_ts_op_type op_type); } #endif -#endif /* GRN_TS_OP_H */ diff --git a/lib/ts/ts_plan.h b/lib/ts/ts_plan.h index c96ee30944..c441adef4c 100644 --- a/lib/ts/ts_plan.h +++ b/lib/ts/ts_plan.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_TS_PLAN_H -#define GRN_TS_PLAN_H +#pragma once #include "../grn.h" @@ -86,4 +85,3 @@ grn_rc grn_ts_planner_push_sorter(grn_ctx *ctx, grn_ts_planner *planner, } #endif -#endif /* GRN_TS_PLAN_H */ diff --git a/lib/ts/ts_sorter.h b/lib/ts/ts_sorter.h index b97db13497..069154d26b 100644 --- a/lib/ts/ts_sorter.h +++ b/lib/ts/ts_sorter.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_TS_SORTER_H -#define GRN_TS_SORTER_H +#pragma once #include "../grn.h" @@ -97,4 +96,3 @@ grn_rc grn_ts_sorter_builder_push(grn_ctx *ctx, grn_ts_sorter_builder *builder, } #endif -#endif /* GRN_TS_SORTER_H */ diff --git a/lib/ts/ts_str.h b/lib/ts/ts_str.h index 08acfb5d2b..bca07b92fb 100644 --- a/lib/ts/ts_str.h +++ b/lib/ts/ts_str.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_TS_STR_H -#define GRN_TS_STR_H +#pragma once #include "../grn.h" @@ -105,4 +104,3 @@ grn_ts_bool grn_ts_str_is_value_name(grn_ts_str str); } #endif -#endif /* GRN_TS_STR_H */ diff --git a/lib/ts/ts_types.h b/lib/ts/ts_types.h index 60646abd09..5a667e2ad1 100644 --- a/lib/ts/ts_types.h +++ b/lib/ts/ts_types.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_TS_TYPES_H -#define GRN_TS_TYPES_H +#pragma once #include "../grn.h" @@ -167,4 +166,3 @@ typedef union { } #endif -#endif /* GRN_TS_TYPES_H */ diff --git a/lib/ts/ts_util.h b/lib/ts/ts_util.h index 6d4f57a41a..2ffbdd6f93 100644 --- a/lib/ts/ts_util.h +++ b/lib/ts/ts_util.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_TS_UTIL_H -#define GRN_TS_UTIL_H +#pragma once #include "../grn.h" @@ -60,4 +59,3 @@ const void *grn_ts_table_get_value(grn_ctx *ctx, grn_obj *table, grn_ts_id id); } #endif -#endif /* GRN_TS_UTIL_H */