From 3db2140e3ecaa9d4540e86a124f9dc58c12f62be Mon Sep 17 00:00:00 2001 From: Jordan DeLong Date: Sat, 20 Apr 2013 09:37:16 -0700 Subject: [PATCH] Fix some cpplint errors about illegal symbols Various perling. --- hphp/compiler/analysis/alias_manager.h | 6 +++--- hphp/compiler/analysis/analysis_result.h | 6 +++--- hphp/compiler/analysis/ast_walker.h | 6 +++--- hphp/compiler/analysis/block_scope.h | 6 +++--- hphp/compiler/analysis/class_scope.h | 6 +++--- hphp/compiler/analysis/code_error.h | 6 +++--- hphp/compiler/analysis/constant_table.h | 6 +++--- hphp/compiler/analysis/control_flow.h | 6 +++--- hphp/compiler/analysis/data_flow.h | 6 +++--- hphp/compiler/analysis/depth_first_visitor.h | 6 +++--- hphp/compiler/analysis/dictionary.h | 6 +++--- hphp/compiler/analysis/emitter.h | 6 +++--- hphp/compiler/analysis/expr_dict.h | 6 +++--- hphp/compiler/analysis/file_scope.h | 6 +++--- hphp/compiler/analysis/function_container.h | 6 +++--- hphp/compiler/analysis/function_scope.h | 6 +++--- hphp/compiler/analysis/live_dict.h | 6 +++--- hphp/compiler/analysis/ref_dict.h | 6 +++--- hphp/compiler/analysis/symbol_table.h | 6 +++--- hphp/compiler/analysis/type.h | 6 +++--- hphp/compiler/analysis/variable_table.h | 6 +++--- hphp/compiler/builtin_symbols.h | 6 +++--- hphp/compiler/code_generator.h | 6 +++--- hphp/compiler/construct.h | 6 +++--- .../compiler/expression/array_element_expression.h | 6 +++--- hphp/compiler/expression/array_pair_expression.h | 6 +++--- hphp/compiler/expression/assignment_expression.h | 6 +++--- hphp/compiler/expression/binary_op_expression.h | 6 +++--- .../expression/class_constant_expression.h | 6 +++--- hphp/compiler/expression/closure_expression.h | 6 +++--- hphp/compiler/expression/constant_expression.h | 6 +++--- hphp/compiler/expression/dynamic_function_call.h | 6 +++--- hphp/compiler/expression/dynamic_variable.h | 6 +++--- hphp/compiler/expression/encaps_list_expression.h | 6 +++--- hphp/compiler/expression/expression.h | 6 +++--- hphp/compiler/expression/expression_list.h | 6 +++--- hphp/compiler/expression/function_call.h | 6 +++--- hphp/compiler/expression/include_expression.h | 6 +++--- hphp/compiler/expression/list_assignment.h | 6 +++--- hphp/compiler/expression/modifier_expression.h | 6 +++--- hphp/compiler/expression/new_object_expression.h | 6 +++--- .../compiler/expression/object_method_expression.h | 6 +++--- .../expression/object_property_expression.h | 6 +++--- hphp/compiler/expression/parameter_expression.h | 6 +++--- hphp/compiler/expression/qop_expression.h | 6 +++--- hphp/compiler/expression/scalar_expression.h | 6 +++--- hphp/compiler/expression/simple_function_call.h | 6 +++--- hphp/compiler/expression/simple_variable.h | 6 +++--- hphp/compiler/expression/static_class_name.h | 6 +++--- .../compiler/expression/static_member_expression.h | 6 +++--- hphp/compiler/expression/unary_op_expression.h | 6 +++--- hphp/compiler/expression/user_attribute.h | 6 +++--- hphp/compiler/expression/yield_expression.h | 6 +++--- hphp/compiler/hphp.h | 6 +++--- hphp/compiler/option.h | 6 +++--- hphp/compiler/package.h | 6 +++--- hphp/compiler/statement/block_statement.h | 6 +++--- hphp/compiler/statement/break_statement.h | 6 +++--- hphp/compiler/statement/case_statement.h | 6 +++--- hphp/compiler/statement/catch_statement.h | 6 +++--- hphp/compiler/statement/class_constant.h | 6 +++--- hphp/compiler/statement/class_statement.h | 6 +++--- hphp/compiler/statement/class_variable.h | 6 +++--- hphp/compiler/statement/continue_statement.h | 6 +++--- hphp/compiler/statement/do_statement.h | 6 +++--- hphp/compiler/statement/echo_statement.h | 6 +++--- hphp/compiler/statement/exp_statement.h | 6 +++--- hphp/compiler/statement/finally_statement.h | 6 +++--- hphp/compiler/statement/for_statement.h | 6 +++--- hphp/compiler/statement/foreach_statement.h | 6 +++--- hphp/compiler/statement/function_statement.h | 6 +++--- hphp/compiler/statement/global_statement.h | 6 +++--- hphp/compiler/statement/goto_statement.h | 6 +++--- hphp/compiler/statement/if_branch_statement.h | 6 +++--- hphp/compiler/statement/if_statement.h | 6 +++--- hphp/compiler/statement/interface_statement.h | 6 +++--- hphp/compiler/statement/label_statement.h | 6 +++--- hphp/compiler/statement/loop_statement.h | 6 +++--- hphp/compiler/statement/method_statement.h | 6 +++--- hphp/compiler/statement/return_statement.h | 6 +++--- hphp/compiler/statement/statement.h | 6 +++--- hphp/compiler/statement/statement_list.h | 6 +++--- hphp/compiler/statement/static_statement.h | 6 +++--- hphp/compiler/statement/switch_statement.h | 6 +++--- hphp/compiler/statement/throw_statement.h | 6 +++--- hphp/compiler/statement/trait_alias_statement.h | 6 +++--- hphp/compiler/statement/trait_prec_statement.h | 6 +++--- hphp/compiler/statement/try_statement.h | 6 +++--- hphp/compiler/statement/unset_statement.h | 6 +++--- hphp/compiler/statement/use_trait_statement.h | 6 +++--- hphp/compiler/statement/while_statement.h | 6 +++--- hphp/compiler/type_annotation.h | 4 ++-- hphp/hhvm/process_init.h | 4 ++-- hphp/runtime/base/array/array_data.h | 6 +++--- hphp/runtime/base/array/array_init.h | 6 +++--- hphp/runtime/base/array/array_inline.h | 6 +++--- hphp/runtime/base/array/array_iterator.h | 6 +++--- hphp/runtime/base/array/array_util.h | 6 +++--- hphp/runtime/base/array/hphp_array.h | 6 +++--- hphp/runtime/base/array/sort_helpers.h | 6 +++--- hphp/runtime/base/base_includes.h | 6 +++--- hphp/runtime/base/binary_operations.h | 6 +++--- hphp/runtime/base/bstring.h | 6 +++--- hphp/runtime/base/builtin_functions.h | 6 +++--- hphp/runtime/base/class_info.h | 6 +++--- hphp/runtime/base/code_coverage.h | 6 +++--- hphp/runtime/base/comparisons.h | 6 +++--- hphp/runtime/base/complex_types.h | 10 +++++----- hphp/runtime/base/debuggable.h | 6 +++--- hphp/runtime/base/execution_context.h | 6 +++--- hphp/runtime/base/externals.h | 6 +++--- hphp/runtime/base/file/bzip2_file.h | 6 +++--- hphp/runtime/base/file/file.h | 6 +++--- hphp/runtime/base/file/mem_file.h | 6 +++--- hphp/runtime/base/file/output_file.h | 6 +++--- hphp/runtime/base/file/pipe.h | 6 +++--- hphp/runtime/base/file/plain_file.h | 6 +++--- hphp/runtime/base/file/socket.h | 6 +++--- hphp/runtime/base/file/ssl_socket.h | 6 +++--- hphp/runtime/base/file/temp_file.h | 6 +++--- hphp/runtime/base/file/url_file.h | 6 +++--- hphp/runtime/base/file/zip_file.h | 6 +++--- hphp/runtime/base/gc_roots.h | 4 ++-- hphp/runtime/base/hphp.h | 6 +++--- hphp/runtime/base/hphp_system.h | 6 +++--- hphp/runtime/base/hphp_value.h | 8 ++++---- hphp/runtime/base/ini_setting.h | 6 +++--- hphp/runtime/base/intercept.h | 6 +++--- hphp/runtime/base/list_assignment.h | 6 +++--- hphp/runtime/base/macros.h | 6 +++--- hphp/runtime/base/md5.h | 4 ++-- hphp/runtime/base/memory/leak_detectable.h | 6 +++--- hphp/runtime/base/memory/memory_manager.h | 6 +++--- hphp/runtime/base/memory/memory_usage_stats.h | 4 ++-- hphp/runtime/base/memory/smart_allocator.h | 6 +++--- hphp/runtime/base/object_data.h | 6 +++--- hphp/runtime/base/preg.h | 6 +++--- hphp/runtime/base/program_functions.h | 6 +++--- hphp/runtime/base/ref_data.h | 8 ++++---- hphp/runtime/base/resource_data.h | 6 +++--- hphp/runtime/base/runtime_error.h | 6 +++--- hphp/runtime/base/runtime_option.h | 6 +++--- hphp/runtime/base/server/access_log.h | 6 +++--- hphp/runtime/base/server/admin_request_handler.h | 6 +++--- hphp/runtime/base/server/dynamic_content_cache.h | 6 +++--- hphp/runtime/base/server/files_match.h | 6 +++--- hphp/runtime/base/server/http_protocol.h | 6 +++--- hphp/runtime/base/server/http_request_handler.h | 6 +++--- hphp/runtime/base/server/http_server.h | 6 +++--- hphp/runtime/base/server/ip_block_map.h | 6 +++--- hphp/runtime/base/server/libevent_server.h | 6 +++--- hphp/runtime/base/server/libevent_server_with_fd.h | 6 +++--- .../base/server/libevent_server_with_takeover.h | 6 +++--- hphp/runtime/base/server/libevent_transport.h | 6 +++--- hphp/runtime/base/server/pagelet_server.h | 6 +++--- hphp/runtime/base/server/replay_transport.h | 6 +++--- hphp/runtime/base/server/request_uri.h | 6 +++--- hphp/runtime/base/server/rpc_request_handler.h | 6 +++--- hphp/runtime/base/server/satellite_server.h | 6 +++--- hphp/runtime/base/server/server.h | 6 +++--- hphp/runtime/base/server/server_note.h | 6 +++--- hphp/runtime/base/server/server_stats.h | 6 +++--- hphp/runtime/base/server/service_thread.h | 6 +++--- hphp/runtime/base/server/source_root_info.h | 6 +++--- hphp/runtime/base/server/static_content_cache.h | 6 +++--- hphp/runtime/base/server/transport.h | 6 +++--- hphp/runtime/base/server/upload.h | 6 +++--- hphp/runtime/base/server/virtual_host.h | 6 +++--- hphp/runtime/base/server/xbox_server.h | 6 +++--- hphp/runtime/base/shared/concurrent_shared_store.h | 6 +++--- hphp/runtime/base/shared/immutable_map.h | 6 +++--- hphp/runtime/base/shared/immutable_obj.h | 6 +++--- hphp/runtime/base/shared/shared_map.h | 6 +++--- hphp/runtime/base/shared/shared_store_base.h | 6 +++--- hphp/runtime/base/shared/shared_store_stats.h | 6 +++--- hphp/runtime/base/shared/shared_string.h | 6 +++--- hphp/runtime/base/shared/shared_variant.h | 6 +++--- hphp/runtime/base/sort_flags.h | 6 +++--- hphp/runtime/base/stat_cache.h | 6 +++--- hphp/runtime/base/string_data.h | 6 +++--- hphp/runtime/base/string_offset.h | 6 +++--- hphp/runtime/base/string_util.h | 6 +++--- hphp/runtime/base/strings.h | 6 +++--- hphp/runtime/base/thread_init_fini.h | 6 +++--- hphp/runtime/base/time/dateinterval.h | 6 +++--- hphp/runtime/base/time/datetime.h | 6 +++--- hphp/runtime/base/time/timestamp.h | 6 +++--- hphp/runtime/base/time/timezone.h | 6 +++--- hphp/runtime/base/timeout_thread.h | 6 +++--- hphp/runtime/base/tv_helpers.h | 8 ++++---- hphp/runtime/base/type_array.h | 8 ++++---- hphp/runtime/base/type_conversions.h | 6 +++--- hphp/runtime/base/type_object.h | 8 ++++---- hphp/runtime/base/type_string.h | 8 ++++---- hphp/runtime/base/type_variant.h | 8 ++++---- hphp/runtime/base/types.h | 6 +++--- hphp/runtime/base/util/countable.h | 6 +++--- hphp/runtime/base/util/curl_tls_workarounds.h | 6 +++--- hphp/runtime/base/util/exceptions.h | 6 +++--- hphp/runtime/base/util/extended_logger.h | 6 +++--- hphp/runtime/base/util/http_client.h | 6 +++--- hphp/runtime/base/util/libevent_http_client.h | 6 +++--- hphp/runtime/base/util/php_thrift_buffer.h | 6 +++--- hphp/runtime/base/util/request_local.h | 6 +++--- hphp/runtime/base/util/simple_counter.h | 4 ++-- hphp/runtime/base/util/smart_object.h | 4 ++-- hphp/runtime/base/util/smart_ptr.h | 6 +++--- hphp/runtime/base/util/string_buffer.h | 6 +++--- hphp/runtime/base/util/thrift_buffer.h | 6 +++--- hphp/runtime/base/variable_serializer.h | 6 +++--- hphp/runtime/base/variable_unserializer.h | 6 +++--- hphp/runtime/base/zend/intl_convert.h | 6 +++--- hphp/runtime/base/zend/utf8_decode.h | 6 +++--- hphp/runtime/base/zend/zend_collator.h | 6 +++--- hphp/runtime/base/zend/zend_functions.h | 6 +++--- hphp/runtime/base/zend/zend_math.h | 6 +++--- hphp/runtime/base/zend/zend_pack.h | 6 +++--- hphp/runtime/base/zend/zend_printf.h | 6 +++--- hphp/runtime/base/zend/zend_qsort.h | 6 +++--- hphp/runtime/base/zend/zend_scanf.h | 6 +++--- hphp/runtime/base/zend/zend_string.cpp | 14 +++++++------- hphp/runtime/base/zend/zend_string.h | 6 +++--- hphp/runtime/base/zend/zend_strtod.h | 6 +++--- hphp/runtime/base/zend/zend_url.h | 6 +++--- hphp/runtime/eval/debugger/break_point.h | 6 +++--- hphp/runtime/eval/debugger/cmd/all.h | 6 +++--- hphp/runtime/eval/debugger/cmd/cmd_abort.h | 6 +++--- hphp/runtime/eval/debugger/cmd/cmd_break.h | 6 +++--- hphp/runtime/eval/debugger/cmd/cmd_complete.h | 6 +++--- hphp/runtime/eval/debugger/cmd/cmd_config.h | 6 +++--- hphp/runtime/eval/debugger/cmd/cmd_constant.h | 6 +++--- hphp/runtime/eval/debugger/cmd/cmd_continue.h | 6 +++--- hphp/runtime/eval/debugger/cmd/cmd_down.h | 6 +++--- hphp/runtime/eval/debugger/cmd/cmd_eval.h | 6 +++--- hphp/runtime/eval/debugger/cmd/cmd_example.h | 6 +++--- hphp/runtime/eval/debugger/cmd/cmd_exception.h | 6 +++--- hphp/runtime/eval/debugger/cmd/cmd_extended.h | 6 +++--- hphp/runtime/eval/debugger/cmd/cmd_extension.h | 6 +++--- hphp/runtime/eval/debugger/cmd/cmd_flow_control.h | 6 +++--- hphp/runtime/eval/debugger/cmd/cmd_frame.h | 6 +++--- hphp/runtime/eval/debugger/cmd/cmd_global.h | 6 +++--- hphp/runtime/eval/debugger/cmd/cmd_help.h | 6 +++--- hphp/runtime/eval/debugger/cmd/cmd_info.h | 6 +++--- hphp/runtime/eval/debugger/cmd/cmd_instrument.h | 6 +++--- hphp/runtime/eval/debugger/cmd/cmd_interrupt.h | 6 +++--- hphp/runtime/eval/debugger/cmd/cmd_jump.h | 6 +++--- hphp/runtime/eval/debugger/cmd/cmd_list.h | 6 +++--- hphp/runtime/eval/debugger/cmd/cmd_machine.h | 6 +++--- hphp/runtime/eval/debugger/cmd/cmd_macro.h | 6 +++--- hphp/runtime/eval/debugger/cmd/cmd_next.h | 6 +++--- hphp/runtime/eval/debugger/cmd/cmd_out.h | 6 +++--- hphp/runtime/eval/debugger/cmd/cmd_print.h | 6 +++--- hphp/runtime/eval/debugger/cmd/cmd_quit.h | 6 +++--- hphp/runtime/eval/debugger/cmd/cmd_run.h | 6 +++--- hphp/runtime/eval/debugger/cmd/cmd_shell.h | 6 +++--- hphp/runtime/eval/debugger/cmd/cmd_signal.h | 6 +++--- hphp/runtime/eval/debugger/cmd/cmd_step.h | 6 +++--- hphp/runtime/eval/debugger/cmd/cmd_thread.h | 6 +++--- hphp/runtime/eval/debugger/cmd/cmd_up.h | 6 +++--- hphp/runtime/eval/debugger/cmd/cmd_user.h | 6 +++--- hphp/runtime/eval/debugger/cmd/cmd_variable.h | 6 +++--- hphp/runtime/eval/debugger/cmd/cmd_where.h | 6 +++--- hphp/runtime/eval/debugger/cmd/cmd_zend.h | 6 +++--- hphp/runtime/eval/debugger/debugger.h | 6 +++--- hphp/runtime/eval/debugger/debugger_base.h | 6 +++--- hphp/runtime/eval/debugger/debugger_client.h | 6 +++--- .../eval/debugger/debugger_client_settings.h | 6 +++--- hphp/runtime/eval/debugger/debugger_command.h | 6 +++--- hphp/runtime/eval/debugger/debugger_proxy.h | 6 +++--- hphp/runtime/eval/debugger/debugger_server.h | 6 +++--- .../runtime/eval/debugger/debugger_thrift_buffer.h | 6 +++--- hphp/runtime/eval/debugger/dummy_sandbox.h | 6 +++--- hphp/runtime/eval/debugger/inst_point.h | 6 +++--- hphp/runtime/eval/runtime/file_repository.h | 6 +++--- hphp/runtime/ext/asio/asio_context.h | 6 +++--- hphp/runtime/ext/asio/asio_session.h | 6 +++--- hphp/runtime/ext/bcmath/bcmath.h | 4 ++-- hphp/runtime/ext/ext_apache.h | 6 +++--- hphp/runtime/ext/ext_apc.h | 6 +++--- hphp/runtime/ext/ext_apd.h | 6 +++--- hphp/runtime/ext/ext_array.h | 6 +++--- hphp/runtime/ext/ext_asio.h | 6 +++--- hphp/runtime/ext/ext_bcmath.h | 6 +++--- hphp/runtime/ext/ext_bzip2.h | 6 +++--- hphp/runtime/ext/ext_class.h | 6 +++--- hphp/runtime/ext/ext_closure.h | 6 +++--- hphp/runtime/ext/ext_collections.h | 6 +++--- hphp/runtime/ext/ext_continuation.h | 6 +++--- hphp/runtime/ext/ext_ctype.h | 6 +++--- hphp/runtime/ext/ext_curl.h | 6 +++--- hphp/runtime/ext/ext_datetime.h | 6 +++--- hphp/runtime/ext/ext_debugger.h | 6 +++--- hphp/runtime/ext/ext_domdocument.h | 6 +++--- hphp/runtime/ext/ext_domdocument_includes.h | 6 +++--- hphp/runtime/ext/ext_error.h | 6 +++--- hphp/runtime/ext/ext_fb.h | 6 +++--- hphp/runtime/ext/ext_file.h | 6 +++--- hphp/runtime/ext/ext_function.h | 6 +++--- hphp/runtime/ext/ext_hash.h | 6 +++--- hphp/runtime/ext/ext_iconv.h | 6 +++--- hphp/runtime/ext/ext_icu.h | 6 +++--- hphp/runtime/ext/ext_icu_ucnv.h | 6 +++--- hphp/runtime/ext/ext_icu_ucsdet.h | 6 +++--- hphp/runtime/ext/ext_image.h | 6 +++--- hphp/runtime/ext/ext_imagesprite.h | 6 +++--- hphp/runtime/ext/ext_imagesprite_include.h | 6 +++--- hphp/runtime/ext/ext_imap.h | 6 +++--- hphp/runtime/ext/ext_intl.h | 6 +++--- hphp/runtime/ext/ext_ipc.h | 6 +++--- hphp/runtime/ext/ext_iterator.h | 6 +++--- hphp/runtime/ext/ext_json.h | 6 +++--- hphp/runtime/ext/ext_ldap.h | 6 +++--- hphp/runtime/ext/ext_magick.h | 6 +++--- hphp/runtime/ext/ext_mailparse.h | 6 +++--- hphp/runtime/ext/ext_math.h | 6 +++--- hphp/runtime/ext/ext_mb.h | 6 +++--- hphp/runtime/ext/ext_mcrypt.h | 6 +++--- hphp/runtime/ext/ext_memcache.h | 6 +++--- hphp/runtime/ext/ext_memcached.h | 6 +++--- hphp/runtime/ext/ext_misc.h | 6 +++--- hphp/runtime/ext/ext_mysql.h | 6 +++--- hphp/runtime/ext/ext_network.h | 6 +++--- hphp/runtime/ext/ext_openssl.h | 6 +++--- hphp/runtime/ext/ext_options.h | 6 +++--- hphp/runtime/ext/ext_output.h | 6 +++--- hphp/runtime/ext/ext_pdo.h | 6 +++--- hphp/runtime/ext/ext_posix.h | 6 +++--- hphp/runtime/ext/ext_preg.h | 6 +++--- hphp/runtime/ext/ext_process.h | 6 +++--- hphp/runtime/ext/ext_reflection.h | 6 +++--- hphp/runtime/ext/ext_server.h | 6 +++--- hphp/runtime/ext/ext_session.h | 6 +++--- hphp/runtime/ext/ext_simplexml.h | 6 +++--- hphp/runtime/ext/ext_simplexml_include.h | 6 +++--- hphp/runtime/ext/ext_soap.h | 6 +++--- hphp/runtime/ext/ext_socket.h | 6 +++--- hphp/runtime/ext/ext_spl.h | 6 +++--- hphp/runtime/ext/ext_splfile.h | 6 +++--- hphp/runtime/ext/ext_sqlite3.h | 6 +++--- hphp/runtime/ext/ext_stream.h | 6 +++--- hphp/runtime/ext/ext_thread.h | 6 +++--- hphp/runtime/ext/ext_thrift.h | 6 +++--- hphp/runtime/ext/ext_url.h | 6 +++--- hphp/runtime/ext/ext_variable.h | 6 +++--- hphp/runtime/ext/ext_xml.h | 6 +++--- hphp/runtime/ext/ext_xmlreader.h | 6 +++--- hphp/runtime/ext/ext_xmlwriter.h | 6 +++--- hphp/runtime/ext/ext_zlib.h | 6 +++--- hphp/runtime/ext/extension.h | 6 +++--- hphp/runtime/ext/hash/hash_adler32.h | 6 +++--- hphp/runtime/ext/hash/hash_crc32.h | 6 +++--- hphp/runtime/ext/hash/hash_engine.h | 6 +++--- hphp/runtime/ext/hash/hash_furc.h | 6 +++--- hphp/runtime/ext/hash/hash_gost.h | 6 +++--- hphp/runtime/ext/hash/hash_haval.h | 6 +++--- hphp/runtime/ext/hash/hash_md.h | 6 +++--- hphp/runtime/ext/hash/hash_murmur.h | 6 +++--- hphp/runtime/ext/hash/hash_ripemd.h | 6 +++--- hphp/runtime/ext/hash/hash_salsa.h | 6 +++--- hphp/runtime/ext/hash/hash_sha.h | 6 +++--- hphp/runtime/ext/hash/hash_snefru.h | 6 +++--- hphp/runtime/ext/hash/hash_tiger.h | 6 +++--- hphp/runtime/ext/hash/hash_whirlpool.h | 6 +++--- hphp/runtime/ext/icu/ICUMatcher.h | 6 +++--- hphp/runtime/ext/icu/ICUTransliterator.h | 6 +++--- hphp/runtime/ext/icu/LifeEventTokenizer.h | 6 +++--- hphp/runtime/ext/mailparse/mime.h | 6 +++--- hphp/runtime/ext/mysql_stats.h | 6 +++--- hphp/runtime/ext/pdo_driver.h | 6 +++--- hphp/runtime/ext/pdo_mysql.h | 6 +++--- hphp/runtime/ext/pdo_sqlite.h | 6 +++--- hphp/runtime/ext/thrift/transport.h | 4 ++-- hphp/runtime/ext_hhvm/ext_hhvm.h | 6 +++--- hphp/runtime/vm/as.h | 4 ++-- hphp/runtime/vm/backup_gc.h | 4 ++-- hphp/runtime/vm/blob_helper.h | 4 ++-- hphp/runtime/vm/bytecode.h | 4 ++-- hphp/runtime/vm/class.h | 4 ++-- hphp/runtime/vm/core_types.h | 4 ++-- hphp/runtime/vm/debug/debug.h | 4 ++-- hphp/runtime/vm/debug/dwarf.h | 4 ++-- hphp/runtime/vm/debug/elfwriter.h | 4 ++-- hphp/runtime/vm/debug/gdb-jit.h | 4 ++-- hphp/runtime/vm/debugger_hook.h | 6 +++--- hphp/runtime/vm/event_hook.h | 4 ++-- hphp/runtime/vm/fixed_string_map.h | 6 +++--- hphp/runtime/vm/func.h | 4 ++-- hphp/runtime/vm/func_inline.h | 4 ++-- hphp/runtime/vm/funcdict.h | 4 ++-- hphp/runtime/vm/hhbc.h | 4 ++-- hphp/runtime/vm/indexed_string_map.h | 4 ++-- hphp/runtime/vm/instance.h | 4 ++-- hphp/runtime/vm/instrumentation.h | 6 +++--- hphp/runtime/vm/instrumentation_hook.h | 6 +++--- hphp/runtime/vm/member_operations.h | 6 +++--- hphp/runtime/vm/name_value_table.h | 4 ++-- hphp/runtime/vm/name_value_table_wrapper.h | 4 ++-- hphp/runtime/vm/object_allocator_sizes.h | 4 ++-- hphp/runtime/vm/pendq.h | 4 ++-- hphp/runtime/vm/php_debug.h | 6 +++--- hphp/runtime/vm/repo.h | 4 ++-- hphp/runtime/vm/repo_helpers.h | 4 ++-- hphp/runtime/vm/request_arena.h | 4 ++-- hphp/runtime/vm/runtime.h | 4 ++-- hphp/runtime/vm/stats.h | 4 ++-- hphp/runtime/vm/translator/abi-x64.h | 4 ++-- hphp/runtime/vm/translator/annotation.h | 4 ++-- hphp/runtime/vm/translator/fixup.h | 4 ++-- hphp/runtime/vm/translator/hooks.h | 4 ++-- hphp/runtime/vm/translator/hopt/cse.h | 4 ++-- hphp/runtime/vm/translator/hopt/opt.h | 4 ++-- hphp/runtime/vm/translator/hopt/simplifier.h | 4 ++-- hphp/runtime/vm/translator/hopt/tracebuilder.h | 4 ++-- .../vm/translator/hopt/vectortranslator-internal.h | 4 ++-- hphp/runtime/vm/translator/immstack.h | 4 ++-- hphp/runtime/vm/translator/regalloc.h | 6 +++--- hphp/runtime/vm/translator/runtime-type.h | 6 +++--- hphp/runtime/vm/translator/srcdb.h | 4 ++-- hphp/runtime/vm/translator/trans-data.h | 4 ++-- hphp/runtime/vm/translator/translator-deps.h | 6 +++--- hphp/runtime/vm/translator/translator-inline.h | 4 ++-- hphp/runtime/vm/translator/translator-runtime.h | 4 ++-- .../vm/translator/translator-x64-internal.h | 4 ++-- hphp/runtime/vm/translator/translator-x64.h | 4 ++-- hphp/runtime/vm/translator/translator.h | 4 ++-- hphp/runtime/vm/translator/types.h | 4 ++-- hphp/runtime/vm/translator/unwind-x64.h | 4 ++-- hphp/runtime/vm/translator/writelease.h | 6 +++--- hphp/runtime/vm/translator/x64-util.h | 4 ++-- hphp/runtime/vm/tread_hash_map.h | 4 ++-- hphp/runtime/vm/treadmill.h | 4 ++-- hphp/runtime/vm/type_profile.h | 6 +++--- hphp/runtime/vm/unit.h | 4 ++-- hphp/runtime/vm/verifier/cfg.h | 6 +++--- hphp/runtime/vm/verifier/check.h | 6 +++--- hphp/runtime/vm/verifier/pretty.h | 6 +++--- hphp/runtime/vm/verifier/util.h | 6 +++--- hphp/system/lib/systemlib.h | 4 ++-- hphp/test/test.h | 6 +++--- hphp/test/test_base.h | 6 +++--- hphp/test/test_code_error.h | 6 +++--- hphp/test/test_code_run.h | 6 +++--- hphp/test/test_cpp_base.h | 6 +++--- hphp/test/test_cpp_ext.h | 6 +++--- hphp/test/test_debugger.h | 6 +++--- hphp/test/test_ext_apache.h | 6 +++--- hphp/test/test_ext_apc.h | 6 +++--- hphp/test/test_ext_apd.h | 6 +++--- hphp/test/test_ext_array.h | 6 +++--- hphp/test/test_ext_asio.h | 6 +++--- hphp/test/test_ext_bcmath.h | 6 +++--- hphp/test/test_ext_bzip2.h | 6 +++--- hphp/test/test_ext_class.h | 6 +++--- hphp/test/test_ext_closure.cpp | 2 -- hphp/test/test_ext_closure.h | 6 +++--- hphp/test/test_ext_collections.h | 6 +++--- hphp/test/test_ext_continuation.h | 6 +++--- hphp/test/test_ext_ctype.h | 6 +++--- hphp/test/test_ext_curl.h | 6 +++--- hphp/test/test_ext_datetime.h | 6 +++--- hphp/test/test_ext_debugger.h | 6 +++--- hphp/test/test_ext_domdocument.h | 6 +++--- hphp/test/test_ext_error.h | 6 +++--- hphp/test/test_ext_fb.h | 6 +++--- hphp/test/test_ext_file.h | 6 +++--- hphp/test/test_ext_function.h | 6 +++--- hphp/test/test_ext_hash.h | 6 +++--- hphp/test/test_ext_iconv.h | 6 +++--- hphp/test/test_ext_icu.h | 6 +++--- hphp/test/test_ext_icu_ucnv.h | 6 +++--- hphp/test/test_ext_icu_ucsdet.h | 6 +++--- hphp/test/test_ext_image.h | 6 +++--- hphp/test/test_ext_imagesprite.h | 6 +++--- hphp/test/test_ext_imap.h | 6 +++--- hphp/test/test_ext_intl.h | 6 +++--- hphp/test/test_ext_ipc.h | 6 +++--- hphp/test/test_ext_iterator.h | 6 +++--- hphp/test/test_ext_json.h | 6 +++--- hphp/test/test_ext_ldap.h | 6 +++--- hphp/test/test_ext_magick.h | 6 +++--- hphp/test/test_ext_mailparse.h | 6 +++--- hphp/test/test_ext_math.h | 6 +++--- hphp/test/test_ext_mb.h | 6 +++--- hphp/test/test_ext_mcrypt.h | 6 +++--- hphp/test/test_ext_memcache.h | 6 +++--- hphp/test/test_ext_memcached.h | 6 +++--- hphp/test/test_ext_misc.h | 6 +++--- hphp/test/test_ext_mysql.h | 6 +++--- hphp/test/test_ext_network.h | 6 +++--- hphp/test/test_ext_openssl.h | 6 +++--- hphp/test/test_ext_options.h | 6 +++--- hphp/test/test_ext_output.h | 6 +++--- hphp/test/test_ext_pdo.h | 6 +++--- hphp/test/test_ext_posix.h | 6 +++--- hphp/test/test_ext_preg.h | 6 +++--- hphp/test/test_ext_process.h | 6 +++--- hphp/test/test_ext_reflection.h | 6 +++--- hphp/test/test_ext_server.h | 6 +++--- hphp/test/test_ext_session.h | 6 +++--- hphp/test/test_ext_simplexml.h | 6 +++--- hphp/test/test_ext_soap.h | 6 +++--- hphp/test/test_ext_socket.h | 6 +++--- hphp/test/test_ext_spl.h | 6 +++--- hphp/test/test_ext_splfile.h | 6 +++--- hphp/test/test_ext_sqlite3.h | 6 +++--- hphp/test/test_ext_stream.h | 6 +++--- hphp/test/test_ext_string.h | 6 +++--- hphp/test/test_ext_thread.h | 6 +++--- hphp/test/test_ext_thrift.h | 6 +++--- hphp/test/test_ext_url.h | 6 +++--- hphp/test/test_ext_variable.h | 6 +++--- hphp/test/test_ext_xml.h | 6 +++--- hphp/test/test_ext_xmlreader.h | 6 +++--- hphp/test/test_ext_xmlwriter.h | 6 +++--- hphp/test/test_ext_zlib.h | 6 +++--- hphp/test/test_logger.h | 6 +++--- hphp/test/test_parser.h | 6 +++--- hphp/test/test_parser_expr.h | 6 +++--- hphp/test/test_parser_stmt.h | 6 +++--- hphp/test/test_server.h | 6 +++--- hphp/test/test_util.h | 6 +++--- hphp/util/alloc.h | 6 +++--- hphp/util/arena.h | 4 ++-- hphp/util/asm-x64.h | 4 ++-- hphp/util/async_func.h | 6 +++--- hphp/util/async_job.h | 6 +++--- hphp/util/atomic.h | 4 ++-- hphp/util/biased_coin.h | 4 ++-- hphp/util/bitops.h | 4 ++-- hphp/util/bits.h | 6 +++--- hphp/util/capability.h | 6 +++--- hphp/util/case_insensitive.h | 6 +++--- hphp/util/compact_sized_ptr.h | 4 ++-- hphp/util/compatibility.h | 6 +++--- hphp/util/compression.h | 6 +++--- hphp/util/cronolog.h | 6 +++--- hphp/util/dataset.h | 6 +++--- hphp/util/db_conn.h | 6 +++--- hphp/util/db_dataset.h | 6 +++--- hphp/util/db_filter.h | 6 +++--- hphp/util/db_mysql.h | 6 +++--- hphp/util/db_query.h | 6 +++--- hphp/util/debug.h | 6 +++--- hphp/util/disasm.h | 4 ++-- hphp/util/exception.h | 6 +++--- hphp/util/exp_arena.h | 4 ++-- hphp/util/file_cache.h | 6 +++--- hphp/util/fixed_vector.h | 4 ++-- hphp/util/hash.h | 6 +++--- hphp/util/hdf.h | 6 +++--- hphp/util/json.h | 6 +++--- hphp/util/kernel_version.h | 4 ++-- hphp/util/lfu_table.h | 6 +++--- hphp/util/light_process.h | 6 +++--- hphp/util/lock.h | 6 +++--- hphp/util/logger.h | 6 +++--- hphp/util/min_max_macros.h | 6 +++--- hphp/util/mutex.h | 6 +++--- hphp/util/neo/cs_config.h | 6 +++--- hphp/util/neo/neo_err.h | 6 +++--- hphp/util/neo/neo_files.h | 6 +++--- hphp/util/neo/neo_hash.h | 6 +++--- hphp/util/neo/neo_hdf.h | 6 +++--- hphp/util/neo/neo_misc.h | 8 ++++---- hphp/util/neo/neo_rand.h | 6 +++--- hphp/util/neo/neo_str.h | 6 +++--- hphp/util/neo/ulist.h | 6 +++--- hphp/util/neo/ulocks.h | 6 +++--- hphp/util/neo/wildmat.h | 6 +++--- hphp/util/network.h | 6 +++--- hphp/util/parser/location.h | 6 +++--- hphp/util/parser/parser.h | 6 +++--- hphp/util/parser/scanner.h | 6 +++--- hphp/util/pointer_list.h | 4 ++-- hphp/util/pool.h | 6 +++--- hphp/util/process.h | 6 +++--- hphp/util/rank.h | 4 ++-- hphp/util/read_only_arena.h | 4 ++-- hphp/util/safesort.h | 6 +++--- hphp/util/shared_memory_allocator.h | 6 +++--- hphp/util/shm_counter.h | 6 +++--- hphp/util/smalllocks.h | 4 ++-- hphp/util/ssl_init.h | 6 +++--- hphp/util/stack_trace.h | 6 +++--- hphp/util/string_bag.h | 6 +++--- hphp/util/synchronizable.h | 6 +++--- hphp/util/synchronizable_multi.h | 6 +++--- hphp/util/text_art.h | 6 +++--- hphp/util/text_color.h | 4 ++-- hphp/util/thread_local.h | 6 +++--- hphp/util/timer.h | 6 +++--- hphp/util/tiny_vector.h | 4 ++-- hphp/util/trace.h | 6 +++--- hphp/util/vdso.h | 4 ++-- 594 files changed, 1717 insertions(+), 1719 deletions(-) diff --git a/hphp/compiler/analysis/alias_manager.h b/hphp/compiler/analysis/alias_manager.h index 4f39d5057..cd44352b1 100644 --- a/hphp/compiler/analysis/alias_manager.h +++ b/hphp/compiler/analysis/alias_manager.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __ALIAS_MANAGER_H__ -#define __ALIAS_MANAGER_H__ +#ifndef incl_HPHP_ALIAS_MANAGER_H_ +#define incl_HPHP_ALIAS_MANAGER_H_ #include @@ -276,4 +276,4 @@ class AliasManager { /////////////////////////////////////////////////////////////////////////////// } -#endif // __ALIAS_MANAGER_H__ +#endif // incl_HPHP_ALIAS_MANAGER_H_ diff --git a/hphp/compiler/analysis/analysis_result.h b/hphp/compiler/analysis/analysis_result.h index a2a3f5154..95f1543f6 100644 --- a/hphp/compiler/analysis/analysis_result.h +++ b/hphp/compiler/analysis/analysis_result.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __ANALYSIS_RESULT_H__ -#define __ANALYSIS_RESULT_H__ +#ifndef incl_HPHP_ANALYSIS_RESULT_H_ +#define incl_HPHP_ANALYSIS_RESULT_H_ #include #include @@ -595,4 +595,4 @@ public: /////////////////////////////////////////////////////////////////////////////// } -#endif // __ANALYSIS_RESULT_H__ +#endif // incl_HPHP_ANALYSIS_RESULT_H_ diff --git a/hphp/compiler/analysis/ast_walker.h b/hphp/compiler/analysis/ast_walker.h index 7793ddffc..281fd5df8 100644 --- a/hphp/compiler/analysis/ast_walker.h +++ b/hphp/compiler/analysis/ast_walker.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __AST_WALKER_H__ -#define __AST_WALKER_H__ +#ifndef incl_HPHP_AST_WALKER_H_ +#define incl_HPHP_AST_WALKER_H_ #include #include @@ -132,4 +132,4 @@ public: /////////////////////////////////////////////////////////////////////////////// } -#endif // __AST_WALKER_H__ +#endif // incl_HPHP_AST_WALKER_H_ diff --git a/hphp/compiler/analysis/block_scope.h b/hphp/compiler/analysis/block_scope.h index 80234908b..902b84509 100644 --- a/hphp/compiler/analysis/block_scope.h +++ b/hphp/compiler/analysis/block_scope.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __BLOCK_SCOPE_H__ -#define __BLOCK_SCOPE_H__ +#ifndef incl_HPHP_BLOCK_SCOPE_H_ +#define incl_HPHP_BLOCK_SCOPE_H_ #include @@ -366,4 +366,4 @@ public: /////////////////////////////////////////////////////////////////////////////// } -#endif // __BLOCK_SCOPE_H__ +#endif // incl_HPHP_BLOCK_SCOPE_H_ diff --git a/hphp/compiler/analysis/class_scope.h b/hphp/compiler/analysis/class_scope.h index 7448615dd..0e6f94b40 100644 --- a/hphp/compiler/analysis/class_scope.h +++ b/hphp/compiler/analysis/class_scope.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __CLASS_SCOPE_H__ -#define __CLASS_SCOPE_H__ +#ifndef incl_HPHP_CLASS_SCOPE_H_ +#define incl_HPHP_CLASS_SCOPE_H_ #include #include @@ -489,4 +489,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __CLASS_SCOPE_H__ +#endif // incl_HPHP_CLASS_SCOPE_H_ diff --git a/hphp/compiler/analysis/code_error.h b/hphp/compiler/analysis/code_error.h index c5b1857cf..0dcfd09d0 100644 --- a/hphp/compiler/analysis/code_error.h +++ b/hphp/compiler/analysis/code_error.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __COMPILER_ERROR_H__ -#define __COMPILER_ERROR_H__ +#ifndef incl_HPHP_COMPILER_ERROR_H_ +#define incl_HPHP_COMPILER_ERROR_H_ #include #include @@ -79,4 +79,4 @@ bool HasError(); // any error /////////////////////////////////////////////////////////////////////////////// }} -#endif // __COMPILER_ERROR_H__ +#endif // incl_HPHP_COMPILER_ERROR_H_ diff --git a/hphp/compiler/analysis/constant_table.h b/hphp/compiler/analysis/constant_table.h index 754aa6cab..cddc9d3e9 100644 --- a/hphp/compiler/analysis/constant_table.h +++ b/hphp/compiler/analysis/constant_table.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __CONSTANT_TABLE_H__ -#define __CONSTANT_TABLE_H__ +#ifndef incl_HPHP_CONSTANT_TABLE_H_ +#define incl_HPHP_CONSTANT_TABLE_H_ #include #include @@ -103,4 +103,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __CONSTANT_TABLE_H__ +#endif // incl_HPHP_CONSTANT_TABLE_H_ diff --git a/hphp/compiler/analysis/control_flow.h b/hphp/compiler/analysis/control_flow.h index 6adbf833f..3a3ad181e 100644 --- a/hphp/compiler/analysis/control_flow.h +++ b/hphp/compiler/analysis/control_flow.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __CONTROL_FLOW_H__ -#define __CONTROL_FLOW_H__ +#ifndef incl_HPHP_CONTROL_FLOW_H_ +#define incl_HPHP_CONTROL_FLOW_H_ #include #include @@ -333,4 +333,4 @@ protected: /////////////////////////////////////////////////////////////////////////////// } -#endif // __CONTROL_FLOW_H__ +#endif // incl_HPHP_CONTROL_FLOW_H_ diff --git a/hphp/compiler/analysis/data_flow.h b/hphp/compiler/analysis/data_flow.h index e46b5ca6f..d8734d06d 100644 --- a/hphp/compiler/analysis/data_flow.h +++ b/hphp/compiler/analysis/data_flow.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __DATA_FLOW_H__ -#define __DATA_FLOW_H__ +#ifndef incl_HPHP_DATA_FLOW_H_ +#define incl_HPHP_DATA_FLOW_H_ #include #include @@ -107,4 +107,4 @@ public: /////////////////////////////////////////////////////////////////////////////// } -#endif // __DATA_FLOW_H__ +#endif // incl_HPHP_DATA_FLOW_H_ diff --git a/hphp/compiler/analysis/depth_first_visitor.h b/hphp/compiler/analysis/depth_first_visitor.h index 602088a30..f543bcd21 100644 --- a/hphp/compiler/analysis/depth_first_visitor.h +++ b/hphp/compiler/analysis/depth_first_visitor.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __DEPTH_FIRST_VISITOR_H__ -#define __DEPTH_FIRST_VISITOR_H__ +#ifndef incl_HPHP_DEPTH_FIRST_VISITOR_H_ +#define incl_HPHP_DEPTH_FIRST_VISITOR_H_ #include #include @@ -230,4 +230,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __DEPTH_FIRST_VISITOR_H__ +#endif // incl_HPHP_DEPTH_FIRST_VISITOR_H_ diff --git a/hphp/compiler/analysis/dictionary.h b/hphp/compiler/analysis/dictionary.h index 65d9225e3..38e7de8d7 100644 --- a/hphp/compiler/analysis/dictionary.h +++ b/hphp/compiler/analysis/dictionary.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __DICTIONARY_H__ -#define __DICTIONARY_H__ +#ifndef incl_HPHP_DICTIONARY_H_ +#define incl_HPHP_DICTIONARY_H_ #include #include @@ -78,4 +78,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __DICTIONARY_H__ +#endif // incl_HPHP_DICTIONARY_H_ diff --git a/hphp/compiler/analysis/emitter.h b/hphp/compiler/analysis/emitter.h index 2c7ae15f4..3f9c7b2de 100644 --- a/hphp/compiler/analysis/emitter.h +++ b/hphp/compiler/analysis/emitter.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __COMPILER_EMITTER_H__ -#define __COMPILER_EMITTER_H__ +#ifndef incl_HPHP_COMPILER_EMITTER_H_ +#define incl_HPHP_COMPILER_EMITTER_H_ #include #include @@ -689,4 +689,4 @@ extern "C" { } } -#endif // __COMPILER_EMITTER_H__ +#endif // incl_HPHP_COMPILER_EMITTER_H_ diff --git a/hphp/compiler/analysis/expr_dict.h b/hphp/compiler/analysis/expr_dict.h index 91dcb95d1..fb454a91b 100644 --- a/hphp/compiler/analysis/expr_dict.h +++ b/hphp/compiler/analysis/expr_dict.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXPR_DICT_H__ -#define __EXPR_DICT_H__ +#ifndef incl_HPHP_EXPR_DICT_H_ +#define incl_HPHP_EXPR_DICT_H_ #include @@ -94,4 +94,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXPR_DICT_H__ +#endif // incl_HPHP_EXPR_DICT_H_ diff --git a/hphp/compiler/analysis/file_scope.h b/hphp/compiler/analysis/file_scope.h index 091fdd58c..4eb4dd8aa 100644 --- a/hphp/compiler/analysis/file_scope.h +++ b/hphp/compiler/analysis/file_scope.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __FILE_SCOPE_H__ -#define __FILE_SCOPE_H__ +#ifndef incl_HPHP_FILE_SCOPE_H_ +#define incl_HPHP_FILE_SCOPE_H_ #include #include @@ -208,4 +208,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __FILE_SCOPE_H__ +#endif // incl_HPHP_FILE_SCOPE_H_ diff --git a/hphp/compiler/analysis/function_container.h b/hphp/compiler/analysis/function_container.h index 0a6c0ca5d..3f10e7c2b 100644 --- a/hphp/compiler/analysis/function_container.h +++ b/hphp/compiler/analysis/function_container.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __FUNCTION_CONTAINER_H__ -#define __FUNCTION_CONTAINER_H__ +#ifndef incl_HPHP_FUNCTION_CONTAINER_H_ +#define incl_HPHP_FUNCTION_CONTAINER_H_ #include @@ -56,4 +56,4 @@ protected: /////////////////////////////////////////////////////////////////////////////// } -#endif // __FUNCTION_CONTAINER_H__ +#endif // incl_HPHP_FUNCTION_CONTAINER_H_ diff --git a/hphp/compiler/analysis/function_scope.h b/hphp/compiler/analysis/function_scope.h index 164fcedfe..a741c13da 100644 --- a/hphp/compiler/analysis/function_scope.h +++ b/hphp/compiler/analysis/function_scope.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __FUNCTION_SCOPE_H__ -#define __FUNCTION_SCOPE_H__ +#ifndef incl_HPHP_FUNCTION_SCOPE_H_ +#define incl_HPHP_FUNCTION_SCOPE_H_ #include #include @@ -493,4 +493,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __FUNCTION_SCOPE_H__ +#endif // incl_HPHP_FUNCTION_SCOPE_H_ diff --git a/hphp/compiler/analysis/live_dict.h b/hphp/compiler/analysis/live_dict.h index cf8f92e59..8be8400a3 100644 --- a/hphp/compiler/analysis/live_dict.h +++ b/hphp/compiler/analysis/live_dict.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __LIVE_DICT_H__ -#define __LIVE_DICT_H__ +#ifndef incl_HPHP_LIVE_DICT_H_ +#define incl_HPHP_LIVE_DICT_H_ #include @@ -53,4 +53,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __LIVE_DICT_H__ +#endif // incl_HPHP_LIVE_DICT_H_ diff --git a/hphp/compiler/analysis/ref_dict.h b/hphp/compiler/analysis/ref_dict.h index a7c289b86..bcecf7b77 100644 --- a/hphp/compiler/analysis/ref_dict.h +++ b/hphp/compiler/analysis/ref_dict.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __REF_DICT_H__ -#define __REF_DICT_H__ +#ifndef incl_HPHP_REF_DICT_H_ +#define incl_HPHP_REF_DICT_H_ #include @@ -63,4 +63,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __REF_DICT_H__ +#endif // incl_HPHP_REF_DICT_H_ diff --git a/hphp/compiler/analysis/symbol_table.h b/hphp/compiler/analysis/symbol_table.h index 513549c3f..a282a36e6 100644 --- a/hphp/compiler/analysis/symbol_table.h +++ b/hphp/compiler/analysis/symbol_table.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __SYMBOL_TABLE_H__ -#define __SYMBOL_TABLE_H__ +#ifndef incl_HPHP_SYMBOL_TABLE_H_ +#define incl_HPHP_SYMBOL_TABLE_H_ #include #include @@ -392,4 +392,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __SYMBOL_TABLE_H__ +#endif // incl_HPHP_SYMBOL_TABLE_H_ diff --git a/hphp/compiler/analysis/type.h b/hphp/compiler/analysis/type.h index d5a3e74a6..417bbac18 100644 --- a/hphp/compiler/analysis/type.h +++ b/hphp/compiler/analysis/type.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TYPE_H__ -#define __TYPE_H__ +#ifndef incl_HPHP_TYPE_H_ +#define incl_HPHP_TYPE_H_ #include #include @@ -274,4 +274,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __TYPE_H__ +#endif // incl_HPHP_TYPE_H_ diff --git a/hphp/compiler/analysis/variable_table.h b/hphp/compiler/analysis/variable_table.h index e647bb6c8..3e9ceec5b 100644 --- a/hphp/compiler/analysis/variable_table.h +++ b/hphp/compiler/analysis/variable_table.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __VARIABLE_TABLE_H__ -#define __VARIABLE_TABLE_H__ +#ifndef incl_HPHP_VARIABLE_TABLE_H_ +#define incl_HPHP_VARIABLE_TABLE_H_ #include #include @@ -353,4 +353,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __VARIABLE_TABLE_H__ +#endif // incl_HPHP_VARIABLE_TABLE_H_ diff --git a/hphp/compiler/builtin_symbols.h b/hphp/compiler/builtin_symbols.h index db98a9a0f..c2c0e4247 100644 --- a/hphp/compiler/builtin_symbols.h +++ b/hphp/compiler/builtin_symbols.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __BUILTIN_SYMBOLS_H__ -#define __BUILTIN_SYMBOLS_H__ +#ifndef incl_HPHP_BUILTIN_SYMBOLS_H_ +#define incl_HPHP_BUILTIN_SYMBOLS_H_ #include #include @@ -105,4 +105,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __BUILTIN_SYMBOLS_H__ +#endif // incl_HPHP_BUILTIN_SYMBOLS_H_ diff --git a/hphp/compiler/code_generator.h b/hphp/compiler/code_generator.h index 0be1df635..af99a90cb 100644 --- a/hphp/compiler/code_generator.h +++ b/hphp/compiler/code_generator.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __CODE_GENERATOR_H__ -#define __CODE_GENERATOR_H__ +#ifndef incl_HPHP_CODE_GENERATOR_H_ +#define incl_HPHP_CODE_GENERATOR_H_ #include @@ -332,4 +332,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __CODE_GENERATOR_H__ +#endif // incl_HPHP_CODE_GENERATOR_H_ diff --git a/hphp/compiler/construct.h b/hphp/compiler/construct.h index 509e3ce43..0a76ffaff 100644 --- a/hphp/compiler/construct.h +++ b/hphp/compiler/construct.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __CONSTRUCT_H__ -#define __CONSTRUCT_H__ +#ifndef incl_HPHP_CONSTRUCT_H_ +#define incl_HPHP_CONSTRUCT_H_ #include #include @@ -333,4 +333,4 @@ protected: /////////////////////////////////////////////////////////////////////////////// } -#endif // __CONSTRUCT_H__ +#endif // incl_HPHP_CONSTRUCT_H_ diff --git a/hphp/compiler/expression/array_element_expression.h b/hphp/compiler/expression/array_element_expression.h index d1d347b97..b98942a7d 100644 --- a/hphp/compiler/expression/array_element_expression.h +++ b/hphp/compiler/expression/array_element_expression.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __ARRAY_ELEMENT_EXPRESSION_H__ -#define __ARRAY_ELEMENT_EXPRESSION_H__ +#ifndef incl_HPHP_ARRAY_ELEMENT_EXPRESSION_H_ +#define incl_HPHP_ARRAY_ELEMENT_EXPRESSION_H_ #include @@ -70,4 +70,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __ARRAY_ELEMENT_EXPRESSION_H__ +#endif // incl_HPHP_ARRAY_ELEMENT_EXPRESSION_H_ diff --git a/hphp/compiler/expression/array_pair_expression.h b/hphp/compiler/expression/array_pair_expression.h index 86d92d1d3..3e601eeca 100644 --- a/hphp/compiler/expression/array_pair_expression.h +++ b/hphp/compiler/expression/array_pair_expression.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __ARRAY_PAIR_EXPRESSION_H__ -#define __ARRAY_PAIR_EXPRESSION_H__ +#ifndef incl_HPHP_ARRAY_PAIR_EXPRESSION_H_ +#define incl_HPHP_ARRAY_PAIR_EXPRESSION_H_ #include @@ -53,4 +53,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __ARRAY_PAIR_EXPRESSION_H__ +#endif // incl_HPHP_ARRAY_PAIR_EXPRESSION_H_ diff --git a/hphp/compiler/expression/assignment_expression.h b/hphp/compiler/expression/assignment_expression.h index ebbd76ddc..bb1758462 100644 --- a/hphp/compiler/expression/assignment_expression.h +++ b/hphp/compiler/expression/assignment_expression.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __ASSIGNMENT_EXPRESSION_H__ -#define __ASSIGNMENT_EXPRESSION_H__ +#ifndef incl_HPHP_ASSIGNMENT_EXPRESSION_H_ +#define incl_HPHP_ASSIGNMENT_EXPRESSION_H_ #include @@ -66,4 +66,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __ASSIGNMENT_EXPRESSION_H__ +#endif // incl_HPHP_ASSIGNMENT_EXPRESSION_H_ diff --git a/hphp/compiler/expression/binary_op_expression.h b/hphp/compiler/expression/binary_op_expression.h index 4cc35c733..e166ede67 100644 --- a/hphp/compiler/expression/binary_op_expression.h +++ b/hphp/compiler/expression/binary_op_expression.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __BINARY_OP_EXPRESSION_H__ -#define __BINARY_OP_EXPRESSION_H__ +#ifndef incl_HPHP_BINARY_OP_EXPRESSION_H_ +#define incl_HPHP_BINARY_OP_EXPRESSION_H_ #include @@ -71,4 +71,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __BINARY_OP_EXPRESSION_H__ +#endif // incl_HPHP_BINARY_OP_EXPRESSION_H_ diff --git a/hphp/compiler/expression/class_constant_expression.h b/hphp/compiler/expression/class_constant_expression.h index 3870e323f..20ae8b3f8 100644 --- a/hphp/compiler/expression/class_constant_expression.h +++ b/hphp/compiler/expression/class_constant_expression.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __CLASS_CONSTANT_EXPRESSION_H__ -#define __CLASS_CONSTANT_EXPRESSION_H__ +#ifndef incl_HPHP_CLASS_CONSTANT_EXPRESSION_H_ +#define incl_HPHP_CLASS_CONSTANT_EXPRESSION_H_ #include #include @@ -55,4 +55,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __CLASS_CONSTANT_EXPRESSION_H__ +#endif // incl_HPHP_CLASS_CONSTANT_EXPRESSION_H_ diff --git a/hphp/compiler/expression/closure_expression.h b/hphp/compiler/expression/closure_expression.h index 841880964..750cad863 100644 --- a/hphp/compiler/expression/closure_expression.h +++ b/hphp/compiler/expression/closure_expression.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __CLOSURE_EXPRESSION_H__ -#define __CLOSURE_EXPRESSION_H__ +#ifndef incl_HPHP_CLOSURE_EXPRESSION_H_ +#define incl_HPHP_CLOSURE_EXPRESSION_H_ #include @@ -54,4 +54,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __CLOSURE_EXPRESSION_H__ +#endif // incl_HPHP_CLOSURE_EXPRESSION_H_ diff --git a/hphp/compiler/expression/constant_expression.h b/hphp/compiler/expression/constant_expression.h index c44e8432c..8c80f969b 100644 --- a/hphp/compiler/expression/constant_expression.h +++ b/hphp/compiler/expression/constant_expression.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __CONSTANT_EXPRESSION_H__ -#define __CONSTANT_EXPRESSION_H__ +#ifndef incl_HPHP_CONSTANT_EXPRESSION_H_ +#define incl_HPHP_CONSTANT_EXPRESSION_H_ #include @@ -79,4 +79,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __CONSTANT_EXPRESSION_H__ +#endif // incl_HPHP_CONSTANT_EXPRESSION_H_ diff --git a/hphp/compiler/expression/dynamic_function_call.h b/hphp/compiler/expression/dynamic_function_call.h index 55e2a223b..ac145e5cf 100644 --- a/hphp/compiler/expression/dynamic_function_call.h +++ b/hphp/compiler/expression/dynamic_function_call.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __DYNAMIC_FUNCTION_CALL_H__ -#define __DYNAMIC_FUNCTION_CALL_H__ +#ifndef incl_HPHP_DYNAMIC_FUNCTION_CALL_H_ +#define incl_HPHP_DYNAMIC_FUNCTION_CALL_H_ #include @@ -37,4 +37,4 @@ public: /////////////////////////////////////////////////////////////////////////////// } -#endif // __DYNAMIC_FUNCTION_CALL_H__ +#endif // incl_HPHP_DYNAMIC_FUNCTION_CALL_H_ diff --git a/hphp/compiler/expression/dynamic_variable.h b/hphp/compiler/expression/dynamic_variable.h index 51769997b..6a18abdc9 100644 --- a/hphp/compiler/expression/dynamic_variable.h +++ b/hphp/compiler/expression/dynamic_variable.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __DYNAMIC_VARIABLE_H__ -#define __DYNAMIC_VARIABLE_H__ +#ifndef incl_HPHP_DYNAMIC_VARIABLE_H_ +#define incl_HPHP_DYNAMIC_VARIABLE_H_ #include @@ -40,4 +40,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __DYNAMIC_VARIABLE_H__ +#endif // incl_HPHP_DYNAMIC_VARIABLE_H_ diff --git a/hphp/compiler/expression/encaps_list_expression.h b/hphp/compiler/expression/encaps_list_expression.h index 2ec982f3b..35f646560 100644 --- a/hphp/compiler/expression/encaps_list_expression.h +++ b/hphp/compiler/expression/encaps_list_expression.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __ENCAPS_LIST_EXPRESSION_H__ -#define __ENCAPS_LIST_EXPRESSION_H__ +#ifndef incl_HPHP_ENCAPS_LIST_EXPRESSION_H_ +#define incl_HPHP_ENCAPS_LIST_EXPRESSION_H_ #include #include @@ -46,4 +46,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __ENCAPS_LIST_EXPRESSION_H__ +#endif // incl_HPHP_ENCAPS_LIST_EXPRESSION_H_ diff --git a/hphp/compiler/expression/expression.h b/hphp/compiler/expression/expression.h index 4cbac592e..62a61fb10 100644 --- a/hphp/compiler/expression/expression.h +++ b/hphp/compiler/expression/expression.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXPRESSION_H__ -#define __EXPRESSION_H__ +#ifndef incl_HPHP_EXPRESSION_H_ +#define incl_HPHP_EXPRESSION_H_ #include #include @@ -418,4 +418,4 @@ protected: /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXPRESSION_H__ +#endif // incl_HPHP_EXPRESSION_H_ diff --git a/hphp/compiler/expression/expression_list.h b/hphp/compiler/expression/expression_list.h index 08f5fec15..47aa0d6fa 100644 --- a/hphp/compiler/expression/expression_list.h +++ b/hphp/compiler/expression/expression_list.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXPRESSION_LIST_H__ -#define __EXPRESSION_LIST_H__ +#ifndef incl_HPHP_EXPRESSION_LIST_H_ +#define incl_HPHP_EXPRESSION_LIST_H_ #include @@ -105,4 +105,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXPRESSION_LIST_H__ +#endif // incl_HPHP_EXPRESSION_LIST_H_ diff --git a/hphp/compiler/expression/function_call.h b/hphp/compiler/expression/function_call.h index d52edafbd..e7f5a688a 100644 --- a/hphp/compiler/expression/function_call.h +++ b/hphp/compiler/expression/function_call.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __FUNCTION_CALL_H__ -#define __FUNCTION_CALL_H__ +#ifndef incl_HPHP_FUNCTION_CALL_H_ +#define incl_HPHP_FUNCTION_CALL_H_ #include #include @@ -108,4 +108,4 @@ protected: /////////////////////////////////////////////////////////////////////////////// } -#endif // __FUNCTION_CALL_H__ +#endif // incl_HPHP_FUNCTION_CALL_H_ diff --git a/hphp/compiler/expression/include_expression.h b/hphp/compiler/expression/include_expression.h index d23c7d5f9..7f87edba8 100644 --- a/hphp/compiler/expression/include_expression.h +++ b/hphp/compiler/expression/include_expression.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __INCLUDE_EXPRESSION_H__ -#define __INCLUDE_EXPRESSION_H__ +#ifndef incl_HPHP_INCLUDE_EXPRESSION_H_ +#define incl_HPHP_INCLUDE_EXPRESSION_H_ #include @@ -66,4 +66,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __INCLUDE_EXPRESSION_H__ +#endif // incl_HPHP_INCLUDE_EXPRESSION_H_ diff --git a/hphp/compiler/expression/list_assignment.h b/hphp/compiler/expression/list_assignment.h index e68244fb7..d34e34d17 100644 --- a/hphp/compiler/expression/list_assignment.h +++ b/hphp/compiler/expression/list_assignment.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __LIST_ASSIGNMENT_H__ -#define __LIST_ASSIGNMENT_H__ +#ifndef incl_HPHP_LIST_ASSIGNMENT_H_ +#define incl_HPHP_LIST_ASSIGNMENT_H_ #include #include @@ -57,4 +57,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __LIST_ASSIGNMENT_H__ +#endif // incl_HPHP_LIST_ASSIGNMENT_H_ diff --git a/hphp/compiler/expression/modifier_expression.h b/hphp/compiler/expression/modifier_expression.h index 86959671e..29a960272 100644 --- a/hphp/compiler/expression/modifier_expression.h +++ b/hphp/compiler/expression/modifier_expression.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __MODIFIER_EXPRESSION_H__ -#define __MODIFIER_EXPRESSION_H__ +#ifndef incl_HPHP_MODIFIER_EXPRESSION_H_ +#define incl_HPHP_MODIFIER_EXPRESSION_H_ #include @@ -52,4 +52,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __MODIFIER_EXPRESSION_H__ +#endif // incl_HPHP_MODIFIER_EXPRESSION_H_ diff --git a/hphp/compiler/expression/new_object_expression.h b/hphp/compiler/expression/new_object_expression.h index 02eba6fca..ce9704139 100644 --- a/hphp/compiler/expression/new_object_expression.h +++ b/hphp/compiler/expression/new_object_expression.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __NEW_OBJECT_EXPRESSION_H__ -#define __NEW_OBJECT_EXPRESSION_H__ +#ifndef incl_HPHP_NEW_OBJECT_EXPRESSION_H_ +#define incl_HPHP_NEW_OBJECT_EXPRESSION_H_ #include @@ -41,4 +41,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __NEW_OBJECT_EXPRESSION_H__ +#endif // incl_HPHP_NEW_OBJECT_EXPRESSION_H_ diff --git a/hphp/compiler/expression/object_method_expression.h b/hphp/compiler/expression/object_method_expression.h index 2d40ca873..0b3b68bb1 100644 --- a/hphp/compiler/expression/object_method_expression.h +++ b/hphp/compiler/expression/object_method_expression.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __OBJECT_METHOD_EXPRESSION_H__ -#define __OBJECT_METHOD_EXPRESSION_H__ +#ifndef incl_HPHP_OBJECT_METHOD_EXPRESSION_H_ +#define incl_HPHP_OBJECT_METHOD_EXPRESSION_H_ #include @@ -52,4 +52,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __OBJECT_METHOD_EXPRESSION_H__ +#endif // incl_HPHP_OBJECT_METHOD_EXPRESSION_H_ diff --git a/hphp/compiler/expression/object_property_expression.h b/hphp/compiler/expression/object_property_expression.h index 6118d9b45..3426386b2 100644 --- a/hphp/compiler/expression/object_property_expression.h +++ b/hphp/compiler/expression/object_property_expression.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __OBJECT_PROPERTY_EXPRESSION_H__ -#define __OBJECT_PROPERTY_EXPRESSION_H__ +#ifndef incl_HPHP_OBJECT_PROPERTY_EXPRESSION_H_ +#define incl_HPHP_OBJECT_PROPERTY_EXPRESSION_H_ #include @@ -65,4 +65,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __OBJECT_PROPERTY_EXPRESSION_H__ +#endif // incl_HPHP_OBJECT_PROPERTY_EXPRESSION_H_ diff --git a/hphp/compiler/expression/parameter_expression.h b/hphp/compiler/expression/parameter_expression.h index 65a55435b..712513e0d 100644 --- a/hphp/compiler/expression/parameter_expression.h +++ b/hphp/compiler/expression/parameter_expression.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __PARAMETER_EXPRESSION_H__ -#define __PARAMETER_EXPRESSION_H__ +#ifndef incl_HPHP_PARAMETER_EXPRESSION_H_ +#define incl_HPHP_PARAMETER_EXPRESSION_H_ #include #include @@ -70,4 +70,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __PARAMETER_EXPRESSION_H__ +#endif // incl_HPHP_PARAMETER_EXPRESSION_H_ diff --git a/hphp/compiler/expression/qop_expression.h b/hphp/compiler/expression/qop_expression.h index e37a76b98..b0046c806 100644 --- a/hphp/compiler/expression/qop_expression.h +++ b/hphp/compiler/expression/qop_expression.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __QOP_EXPRESSION_H__ -#define __QOP_EXPRESSION_H__ +#ifndef incl_HPHP_QOP_EXPRESSION_H_ +#define incl_HPHP_QOP_EXPRESSION_H_ #include @@ -48,4 +48,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __QOP_EXPRESSION_H__ +#endif // incl_HPHP_QOP_EXPRESSION_H_ diff --git a/hphp/compiler/expression/scalar_expression.h b/hphp/compiler/expression/scalar_expression.h index e0f527db3..851da5b22 100644 --- a/hphp/compiler/expression/scalar_expression.h +++ b/hphp/compiler/expression/scalar_expression.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __SCALAR_EXPRESSION_H__ -#define __SCALAR_EXPRESSION_H__ +#ifndef incl_HPHP_SCALAR_EXPRESSION_H_ +#define incl_HPHP_SCALAR_EXPRESSION_H_ #include #include @@ -89,4 +89,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __SCALAR_EXPRESSION_H__ +#endif // incl_HPHP_SCALAR_EXPRESSION_H_ diff --git a/hphp/compiler/expression/simple_function_call.h b/hphp/compiler/expression/simple_function_call.h index 4aadf9c1c..95d59658d 100644 --- a/hphp/compiler/expression/simple_function_call.h +++ b/hphp/compiler/expression/simple_function_call.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __SIMPLE_FUNCTION_CALL_H__ -#define __SIMPLE_FUNCTION_CALL_H__ +#ifndef incl_HPHP_SIMPLE_FUNCTION_CALL_H_ +#define incl_HPHP_SIMPLE_FUNCTION_CALL_H_ #include #include @@ -148,4 +148,4 @@ ExpressionPtr hphp_opt_call_user_func(CodeGenerator *cg, /////////////////////////////////////////////////////////////////////////////// } // HPHP -#endif // __SIMPLE_FUNCTION_CALL_H__ +#endif // incl_HPHP_SIMPLE_FUNCTION_CALL_H_ diff --git a/hphp/compiler/expression/simple_variable.h b/hphp/compiler/expression/simple_variable.h index 6a7fc17ef..41b348446 100644 --- a/hphp/compiler/expression/simple_variable.h +++ b/hphp/compiler/expression/simple_variable.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __SIMPLE_VARIABLE_H__ -#define __SIMPLE_VARIABLE_H__ +#ifndef incl_HPHP_SIMPLE_VARIABLE_H_ +#define incl_HPHP_SIMPLE_VARIABLE_H_ #include @@ -76,4 +76,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __SIMPLE_VARIABLE_H__ +#endif // incl_HPHP_SIMPLE_VARIABLE_H_ diff --git a/hphp/compiler/expression/static_class_name.h b/hphp/compiler/expression/static_class_name.h index b52b70692..df86b4d00 100644 --- a/hphp/compiler/expression/static_class_name.h +++ b/hphp/compiler/expression/static_class_name.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __STATIC_CLASS_NAME_H__ -#define __STATIC_CLASS_NAME_H__ +#ifndef incl_HPHP_STATIC_CLASS_NAME_H_ +#define incl_HPHP_STATIC_CLASS_NAME_H_ #include @@ -69,4 +69,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __STATIC_CLASS_NAME_H__ +#endif // incl_HPHP_STATIC_CLASS_NAME_H_ diff --git a/hphp/compiler/expression/static_member_expression.h b/hphp/compiler/expression/static_member_expression.h index 414e3677e..3ee42c7e7 100644 --- a/hphp/compiler/expression/static_member_expression.h +++ b/hphp/compiler/expression/static_member_expression.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __STATIC_MEMBER_EXPRESSION_H__ -#define __STATIC_MEMBER_EXPRESSION_H__ +#ifndef incl_HPHP_STATIC_MEMBER_EXPRESSION_H_ +#define incl_HPHP_STATIC_MEMBER_EXPRESSION_H_ #include @@ -51,4 +51,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __STATIC_MEMBER_EXPRESSION_H__ +#endif // incl_HPHP_STATIC_MEMBER_EXPRESSION_H_ diff --git a/hphp/compiler/expression/unary_op_expression.h b/hphp/compiler/expression/unary_op_expression.h index d628cf46d..625376808 100644 --- a/hphp/compiler/expression/unary_op_expression.h +++ b/hphp/compiler/expression/unary_op_expression.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __UNARY_OP_EXPRESSION_H__ -#define __UNARY_OP_EXPRESSION_H__ +#ifndef incl_HPHP_UNARY_OP_EXPRESSION_H_ +#define incl_HPHP_UNARY_OP_EXPRESSION_H_ #include #include @@ -76,4 +76,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __UNARY_OP_EXPRESSION_H__ +#endif // incl_HPHP_UNARY_OP_EXPRESSION_H_ diff --git a/hphp/compiler/expression/user_attribute.h b/hphp/compiler/expression/user_attribute.h index 717bc74fc..fd823b228 100644 --- a/hphp/compiler/expression/user_attribute.h +++ b/hphp/compiler/expression/user_attribute.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __USER_ATTRIBUTE_H__ -#define __USER_ATTRIBUTE_H__ +#ifndef incl_HPHP_USER_ATTRIBUTE_H_ +#define incl_HPHP_USER_ATTRIBUTE_H_ #include @@ -43,4 +43,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __USER_ATTRIBUTE_H__ +#endif // incl_HPHP_USER_ATTRIBUTE_H_ diff --git a/hphp/compiler/expression/yield_expression.h b/hphp/compiler/expression/yield_expression.h index 92613b3da..662ec4540 100644 --- a/hphp/compiler/expression/yield_expression.h +++ b/hphp/compiler/expression/yield_expression.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __YIELD_EXPRESSION_H__ -#define __YIELD_EXPRESSION_H__ +#ifndef incl_HPHP_YIELD_EXPRESSION_H_ +#define incl_HPHP_YIELD_EXPRESSION_H_ #include @@ -43,4 +43,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __YIELD_EXPRESSION_H__ +#endif // incl_HPHP_YIELD_EXPRESSION_H_ diff --git a/hphp/compiler/hphp.h b/hphp/compiler/hphp.h index 8b1e55e20..123a7016c 100644 --- a/hphp/compiler/hphp.h +++ b/hphp/compiler/hphp.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_H__ -#define __HPHP_H__ +#ifndef incl_HPHP_H_ +#define incl_HPHP_H_ #include #include @@ -32,4 +32,4 @@ template struct hphp_string_hash_map : /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_H__ +#endif // incl_HPHP_H_ diff --git a/hphp/compiler/option.h b/hphp/compiler/option.h index 3049d9bf6..96075501e 100644 --- a/hphp/compiler/option.h +++ b/hphp/compiler/option.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __OPTION_H__ -#define __OPTION_H__ +#ifndef incl_HPHP_OPTION_H_ +#define incl_HPHP_OPTION_H_ #include #include @@ -300,4 +300,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __OPTION_H__ +#endif // incl_HPHP_OPTION_H_ diff --git a/hphp/compiler/package.h b/hphp/compiler/package.h index 7c7b72897..ab4e6b8ba 100644 --- a/hphp/compiler/package.h +++ b/hphp/compiler/package.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __PACKAGE_H__ -#define __PACKAGE_H__ +#ifndef incl_HPHP_PACKAGE_H_ +#define incl_HPHP_PACKAGE_H_ #include #include @@ -89,4 +89,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __PACKAGE_H__ +#endif // incl_HPHP_PACKAGE_H_ diff --git a/hphp/compiler/statement/block_statement.h b/hphp/compiler/statement/block_statement.h index 1e6469a10..694dadd5e 100644 --- a/hphp/compiler/statement/block_statement.h +++ b/hphp/compiler/statement/block_statement.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __BLOCK_STATEMENT_H__ -#define __BLOCK_STATEMENT_H__ +#ifndef incl_HPHP_BLOCK_STATEMENT_H_ +#define incl_HPHP_BLOCK_STATEMENT_H_ #include @@ -43,4 +43,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __BLOCK_STATEMENT_H__ +#endif // incl_HPHP_BLOCK_STATEMENT_H_ diff --git a/hphp/compiler/statement/break_statement.h b/hphp/compiler/statement/break_statement.h index 020801d93..3d9599eff 100644 --- a/hphp/compiler/statement/break_statement.h +++ b/hphp/compiler/statement/break_statement.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __BREAK_STATEMENT_H__ -#define __BREAK_STATEMENT_H__ +#ifndef incl_HPHP_BREAK_STATEMENT_H_ +#define incl_HPHP_BREAK_STATEMENT_H_ #include @@ -41,4 +41,4 @@ protected: /////////////////////////////////////////////////////////////////////////////// } -#endif // __BREAK_STATEMENT_H__ +#endif // incl_HPHP_BREAK_STATEMENT_H_ diff --git a/hphp/compiler/statement/case_statement.h b/hphp/compiler/statement/case_statement.h index 33c7dbe87..c1a178427 100644 --- a/hphp/compiler/statement/case_statement.h +++ b/hphp/compiler/statement/case_statement.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __CASE_STATEMENT_H__ -#define __CASE_STATEMENT_H__ +#ifndef incl_HPHP_CASE_STATEMENT_H_ +#define incl_HPHP_CASE_STATEMENT_H_ #include @@ -62,4 +62,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __CASE_STATEMENT_H__ +#endif // incl_HPHP_CASE_STATEMENT_H_ diff --git a/hphp/compiler/statement/catch_statement.h b/hphp/compiler/statement/catch_statement.h index 4e0a2b7ac..5aab0748d 100644 --- a/hphp/compiler/statement/catch_statement.h +++ b/hphp/compiler/statement/catch_statement.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __CATCH_STATEMENT_H__ -#define __CATCH_STATEMENT_H__ +#ifndef incl_HPHP_CATCH_STATEMENT_H_ +#define incl_HPHP_CATCH_STATEMENT_H_ #include #include @@ -58,4 +58,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __CATCH_STATEMENT_H__ +#endif // incl_HPHP_CATCH_STATEMENT_H_ diff --git a/hphp/compiler/statement/class_constant.h b/hphp/compiler/statement/class_constant.h index f1027a5f6..a492821a0 100644 --- a/hphp/compiler/statement/class_constant.h +++ b/hphp/compiler/statement/class_constant.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __CLASS_CONSTANT_H__ -#define __CLASS_CONSTANT_H__ +#ifndef incl_HPHP_CLASS_CONSTANT_H_ +#define incl_HPHP_CLASS_CONSTANT_H_ #include @@ -46,4 +46,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __CLASS_CONSTANT_H__ +#endif // incl_HPHP_CLASS_CONSTANT_H_ diff --git a/hphp/compiler/statement/class_statement.h b/hphp/compiler/statement/class_statement.h index 3261ed4f5..07fb3c68b 100644 --- a/hphp/compiler/statement/class_statement.h +++ b/hphp/compiler/statement/class_statement.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __CLASS_STATEMENT_H__ -#define __CLASS_STATEMENT_H__ +#ifndef incl_HPHP_CLASS_STATEMENT_H_ +#define incl_HPHP_CLASS_STATEMENT_H_ #include #include @@ -59,4 +59,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __CLASS_STATEMENT_H__ +#endif // incl_HPHP_CLASS_STATEMENT_H_ diff --git a/hphp/compiler/statement/class_variable.h b/hphp/compiler/statement/class_variable.h index 7b0b4eff3..17fa69717 100644 --- a/hphp/compiler/statement/class_variable.h +++ b/hphp/compiler/statement/class_variable.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __CLASS_VARIABLE_H__ -#define __CLASS_VARIABLE_H__ +#ifndef incl_HPHP_CLASS_VARIABLE_H_ +#define incl_HPHP_CLASS_VARIABLE_H_ #include @@ -55,4 +55,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __CLASS_VARIABLE_H__ +#endif // incl_HPHP_CLASS_VARIABLE_H_ diff --git a/hphp/compiler/statement/continue_statement.h b/hphp/compiler/statement/continue_statement.h index 466e15c61..7f66c7319 100644 --- a/hphp/compiler/statement/continue_statement.h +++ b/hphp/compiler/statement/continue_statement.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __CONTINUE_STATEMENT_H__ -#define __CONTINUE_STATEMENT_H__ +#ifndef incl_HPHP_CONTINUE_STATEMENT_H_ +#define incl_HPHP_CONTINUE_STATEMENT_H_ #include @@ -32,4 +32,4 @@ public: /////////////////////////////////////////////////////////////////////////////// } -#endif // __CONTINUE_STATEMENT_H__ +#endif // incl_HPHP_CONTINUE_STATEMENT_H_ diff --git a/hphp/compiler/statement/do_statement.h b/hphp/compiler/statement/do_statement.h index 7fe76f90f..01b5d5010 100644 --- a/hphp/compiler/statement/do_statement.h +++ b/hphp/compiler/statement/do_statement.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __DO_STATEMENT_H__ -#define __DO_STATEMENT_H__ +#ifndef incl_HPHP_DO_STATEMENT_H_ +#define incl_HPHP_DO_STATEMENT_H_ #include @@ -46,4 +46,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __DO_STATEMENT_H__ +#endif // incl_HPHP_DO_STATEMENT_H_ diff --git a/hphp/compiler/statement/echo_statement.h b/hphp/compiler/statement/echo_statement.h index 7a1862514..d51c54ae8 100644 --- a/hphp/compiler/statement/echo_statement.h +++ b/hphp/compiler/statement/echo_statement.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __ECHO_STATEMENT_H__ -#define __ECHO_STATEMENT_H__ +#ifndef incl_HPHP_ECHO_STATEMENT_H_ +#define incl_HPHP_ECHO_STATEMENT_H_ #include @@ -38,4 +38,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __ECHO_STATEMENT_H__ +#endif // incl_HPHP_ECHO_STATEMENT_H_ diff --git a/hphp/compiler/statement/exp_statement.h b/hphp/compiler/statement/exp_statement.h index c454a7f9b..4a4bf7c3a 100644 --- a/hphp/compiler/statement/exp_statement.h +++ b/hphp/compiler/statement/exp_statement.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXP_STATEMENT_H__ -#define __EXP_STATEMENT_H__ +#ifndef incl_HPHP_EXP_STATEMENT_H_ +#define incl_HPHP_EXP_STATEMENT_H_ #include @@ -46,4 +46,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXP_STATEMENT_H__ +#endif // incl_HPHP_EXP_STATEMENT_H_ diff --git a/hphp/compiler/statement/finally_statement.h b/hphp/compiler/statement/finally_statement.h index 60f898221..82b1e0bda 100644 --- a/hphp/compiler/statement/finally_statement.h +++ b/hphp/compiler/statement/finally_statement.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __FINALLY_STATEMENT_H__ -#define __FINALLY_STATEMENT_H__ +#ifndef incl_HPHP_FINALLY_STATEMENT_H_ +#define incl_HPHP_FINALLY_STATEMENT_H_ #include @@ -42,4 +42,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __FINALLY_STATEMENT_H__ +#endif // incl_HPHP_FINALLY_STATEMENT_H_ diff --git a/hphp/compiler/statement/for_statement.h b/hphp/compiler/statement/for_statement.h index c80368e2b..3ef0d0714 100644 --- a/hphp/compiler/statement/for_statement.h +++ b/hphp/compiler/statement/for_statement.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __FOR_STATEMENT_H__ -#define __FOR_STATEMENT_H__ +#ifndef incl_HPHP_FOR_STATEMENT_H_ +#define incl_HPHP_FOR_STATEMENT_H_ #include @@ -51,4 +51,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __FOR_STATEMENT_H__ +#endif // incl_HPHP_FOR_STATEMENT_H_ diff --git a/hphp/compiler/statement/foreach_statement.h b/hphp/compiler/statement/foreach_statement.h index db0a108c5..44015e172 100644 --- a/hphp/compiler/statement/foreach_statement.h +++ b/hphp/compiler/statement/foreach_statement.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __FOREACH_STATEMENT_H__ -#define __FOREACH_STATEMENT_H__ +#ifndef incl_HPHP_FOREACH_STATEMENT_H_ +#define incl_HPHP_FOREACH_STATEMENT_H_ #include @@ -53,4 +53,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __FOREACH_STATEMENT_H__ +#endif // incl_HPHP_FOREACH_STATEMENT_H_ diff --git a/hphp/compiler/statement/function_statement.h b/hphp/compiler/statement/function_statement.h index 7fa4b8d47..0e974697e 100644 --- a/hphp/compiler/statement/function_statement.h +++ b/hphp/compiler/statement/function_statement.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __FUNCTION_STATEMENT_H__ -#define __FUNCTION_STATEMENT_H__ +#ifndef incl_HPHP_FUNCTION_STATEMENT_H_ +#define incl_HPHP_FUNCTION_STATEMENT_H_ #include #include @@ -58,4 +58,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __FUNCTION_STATEMENT_H__ +#endif // incl_HPHP_FUNCTION_STATEMENT_H_ diff --git a/hphp/compiler/statement/global_statement.h b/hphp/compiler/statement/global_statement.h index 9bda5241e..837d00004 100644 --- a/hphp/compiler/statement/global_statement.h +++ b/hphp/compiler/statement/global_statement.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __GLOBAL_STATEMENT_H__ -#define __GLOBAL_STATEMENT_H__ +#ifndef incl_HPHP_GLOBAL_STATEMENT_H_ +#define incl_HPHP_GLOBAL_STATEMENT_H_ #include @@ -41,4 +41,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __GLOBAL_STATEMENT_H__ +#endif // incl_HPHP_GLOBAL_STATEMENT_H_ diff --git a/hphp/compiler/statement/goto_statement.h b/hphp/compiler/statement/goto_statement.h index fb56d27c2..68d86b500 100644 --- a/hphp/compiler/statement/goto_statement.h +++ b/hphp/compiler/statement/goto_statement.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __GOTO_STATEMENT_H__ -#define __GOTO_STATEMENT_H__ +#ifndef incl_HPHP_GOTO_STATEMENT_H_ +#define incl_HPHP_GOTO_STATEMENT_H_ #include #include @@ -45,4 +45,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __GOTO_STATEMENT_H__ +#endif // incl_HPHP_GOTO_STATEMENT_H_ diff --git a/hphp/compiler/statement/if_branch_statement.h b/hphp/compiler/statement/if_branch_statement.h index 2568cd3dc..f835e404d 100644 --- a/hphp/compiler/statement/if_branch_statement.h +++ b/hphp/compiler/statement/if_branch_statement.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __IF_BRANCH_STATEMENT_H__ -#define __IF_BRANCH_STATEMENT_H__ +#ifndef incl_HPHP_IF_BRANCH_STATEMENT_H_ +#define incl_HPHP_IF_BRANCH_STATEMENT_H_ #include @@ -45,4 +45,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __IF_BRANCH_STATEMENT_H__ +#endif // incl_HPHP_IF_BRANCH_STATEMENT_H_ diff --git a/hphp/compiler/statement/if_statement.h b/hphp/compiler/statement/if_statement.h index 3c02937fb..700a33c22 100644 --- a/hphp/compiler/statement/if_statement.h +++ b/hphp/compiler/statement/if_statement.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __IF_STATEMENT_H__ -#define __IF_STATEMENT_H__ +#ifndef incl_HPHP_IF_STATEMENT_H_ +#define incl_HPHP_IF_STATEMENT_H_ #include @@ -44,4 +44,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __IF_STATEMENT_H__ +#endif // incl_HPHP_IF_STATEMENT_H_ diff --git a/hphp/compiler/statement/interface_statement.h b/hphp/compiler/statement/interface_statement.h index ff718aa9e..d2a5e57a2 100644 --- a/hphp/compiler/statement/interface_statement.h +++ b/hphp/compiler/statement/interface_statement.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __INTERFACE_STATEMENT_H__ -#define __INTERFACE_STATEMENT_H__ +#ifndef incl_HPHP_INTERFACE_STATEMENT_H_ +#define incl_HPHP_INTERFACE_STATEMENT_H_ #include @@ -74,4 +74,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __INTERFACE_STATEMENT_H__ +#endif // incl_HPHP_INTERFACE_STATEMENT_H_ diff --git a/hphp/compiler/statement/label_statement.h b/hphp/compiler/statement/label_statement.h index 40039d770..5969fc924 100644 --- a/hphp/compiler/statement/label_statement.h +++ b/hphp/compiler/statement/label_statement.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __LABEL_STATEMENT_H__ -#define __LABEL_STATEMENT_H__ +#ifndef incl_HPHP_LABEL_STATEMENT_H_ +#define incl_HPHP_LABEL_STATEMENT_H_ #include @@ -40,4 +40,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __LABEL_STATEMENT_H__ +#endif // incl_HPHP_LABEL_STATEMENT_H_ diff --git a/hphp/compiler/statement/loop_statement.h b/hphp/compiler/statement/loop_statement.h index a63556a07..70264bd79 100644 --- a/hphp/compiler/statement/loop_statement.h +++ b/hphp/compiler/statement/loop_statement.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __LOOP_STATEMENT_H__ -#define __LOOP_STATEMENT_H__ +#ifndef incl_HPHP_LOOP_STATEMENT_H_ +#define incl_HPHP_LOOP_STATEMENT_H_ #include @@ -40,4 +40,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __LOOP_STATEMENT_H__ +#endif // incl_HPHP_LOOP_STATEMENT_H_ diff --git a/hphp/compiler/statement/method_statement.h b/hphp/compiler/statement/method_statement.h index 5afb426b5..5afa08ff4 100644 --- a/hphp/compiler/statement/method_statement.h +++ b/hphp/compiler/statement/method_statement.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __METHOD_STATEMENT_H__ -#define __METHOD_STATEMENT_H__ +#ifndef incl_HPHP_METHOD_STATEMENT_H_ +#define incl_HPHP_METHOD_STATEMENT_H_ #include @@ -147,4 +147,4 @@ protected: /////////////////////////////////////////////////////////////////////////////// } -#endif // __METHOD_STATEMENT_H__ +#endif // incl_HPHP_METHOD_STATEMENT_H_ diff --git a/hphp/compiler/statement/return_statement.h b/hphp/compiler/statement/return_statement.h index 2307662d4..718f5b409 100644 --- a/hphp/compiler/statement/return_statement.h +++ b/hphp/compiler/statement/return_statement.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __RETURN_STATEMENT_H__ -#define __RETURN_STATEMENT_H__ +#ifndef incl_HPHP_RETURN_STATEMENT_H_ +#define incl_HPHP_RETURN_STATEMENT_H_ #include @@ -48,4 +48,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __RETURN_STATEMENT_H__ +#endif // incl_HPHP_RETURN_STATEMENT_H_ diff --git a/hphp/compiler/statement/statement.h b/hphp/compiler/statement/statement.h index 2b88b279a..081a0fe9b 100644 --- a/hphp/compiler/statement/statement.h +++ b/hphp/compiler/statement/statement.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __STATEMENT_H__ -#define __STATEMENT_H__ +#ifndef incl_HPHP_STATEMENT_H_ +#define incl_HPHP_STATEMENT_H_ #include @@ -157,4 +157,4 @@ protected: /////////////////////////////////////////////////////////////////////////////// } -#endif // __STATEMENT_H__ +#endif // incl_HPHP_STATEMENT_H_ diff --git a/hphp/compiler/statement/statement_list.h b/hphp/compiler/statement/statement_list.h index c1bffb166..dbf17c879 100644 --- a/hphp/compiler/statement/statement_list.h +++ b/hphp/compiler/statement/statement_list.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __STATEMENT_LIST_H__ -#define __STATEMENT_LIST_H__ +#ifndef incl_HPHP_STATEMENT_LIST_H_ +#define incl_HPHP_STATEMENT_LIST_H_ #include @@ -66,4 +66,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __STATEMENT_LIST_H__ +#endif // incl_HPHP_STATEMENT_LIST_H_ diff --git a/hphp/compiler/statement/static_statement.h b/hphp/compiler/statement/static_statement.h index 7409be7d5..1d718ca36 100644 --- a/hphp/compiler/statement/static_statement.h +++ b/hphp/compiler/statement/static_statement.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __STATIC_STATEMENT_H__ -#define __STATIC_STATEMENT_H__ +#ifndef incl_HPHP_STATIC_STATEMENT_H_ +#define incl_HPHP_STATIC_STATEMENT_H_ #include #include @@ -40,4 +40,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __STATIC_STATEMENT_H__ +#endif // incl_HPHP_STATIC_STATEMENT_H_ diff --git a/hphp/compiler/statement/switch_statement.h b/hphp/compiler/statement/switch_statement.h index be95280d9..be327a8ae 100644 --- a/hphp/compiler/statement/switch_statement.h +++ b/hphp/compiler/statement/switch_statement.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __SWITCH_STATEMENT_H__ -#define __SWITCH_STATEMENT_H__ +#ifndef incl_HPHP_SWITCH_STATEMENT_H_ +#define incl_HPHP_SWITCH_STATEMENT_H_ #include #include @@ -51,4 +51,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __SWITCH_STATEMENT_H__ +#endif // incl_HPHP_SWITCH_STATEMENT_H_ diff --git a/hphp/compiler/statement/throw_statement.h b/hphp/compiler/statement/throw_statement.h index 26b8633db..97b04ef99 100644 --- a/hphp/compiler/statement/throw_statement.h +++ b/hphp/compiler/statement/throw_statement.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __THROW_STATEMENT_H__ -#define __THROW_STATEMENT_H__ +#ifndef incl_HPHP_THROW_STATEMENT_H_ +#define incl_HPHP_THROW_STATEMENT_H_ #include @@ -37,4 +37,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __THROW_STATEMENT_H__ +#endif // incl_HPHP_THROW_STATEMENT_H_ diff --git a/hphp/compiler/statement/trait_alias_statement.h b/hphp/compiler/statement/trait_alias_statement.h index 21cb30264..8ecc10607 100644 --- a/hphp/compiler/statement/trait_alias_statement.h +++ b/hphp/compiler/statement/trait_alias_statement.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TRAIT_ALIAS_STATEMENT_H__ -#define __TRAIT_ALIAS_STATEMENT_H__ +#ifndef incl_HPHP_TRAIT_ALIAS_STATEMENT_H_ +#define incl_HPHP_TRAIT_ALIAS_STATEMENT_H_ #include #include @@ -60,4 +60,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __TRAIT_ALIAS_STATEMENT_H__ +#endif // incl_HPHP_TRAIT_ALIAS_STATEMENT_H_ diff --git a/hphp/compiler/statement/trait_prec_statement.h b/hphp/compiler/statement/trait_prec_statement.h index f89450a34..f5250c060 100644 --- a/hphp/compiler/statement/trait_prec_statement.h +++ b/hphp/compiler/statement/trait_prec_statement.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TRAIT_PREC_STATEMENT_H__ -#define __TRAIT_PREC_STATEMENT_H__ +#ifndef incl_HPHP_TRAIT_PREC_STATEMENT_H_ +#define incl_HPHP_TRAIT_PREC_STATEMENT_H_ #include #include @@ -47,4 +47,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __TRAIT_PREC_STATEMENT_H__ +#endif // incl_HPHP_TRAIT_PREC_STATEMENT_H_ diff --git a/hphp/compiler/statement/try_statement.h b/hphp/compiler/statement/try_statement.h index 8129ff451..83f471a31 100644 --- a/hphp/compiler/statement/try_statement.h +++ b/hphp/compiler/statement/try_statement.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TRY_STATEMENT_H__ -#define __TRY_STATEMENT_H__ +#ifndef incl_HPHP_TRY_STATEMENT_H_ +#define incl_HPHP_TRY_STATEMENT_H_ #include @@ -52,4 +52,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __TRY_STATEMENT_H__ +#endif // incl_HPHP_TRY_STATEMENT_H_ diff --git a/hphp/compiler/statement/unset_statement.h b/hphp/compiler/statement/unset_statement.h index 70c7bf12b..d0d5a807d 100644 --- a/hphp/compiler/statement/unset_statement.h +++ b/hphp/compiler/statement/unset_statement.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __UNSET_STATEMENT_H__ -#define __UNSET_STATEMENT_H__ +#ifndef incl_HPHP_UNSET_STATEMENT_H_ +#define incl_HPHP_UNSET_STATEMENT_H_ #include @@ -40,4 +40,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __UNSET_STATEMENT_H__ +#endif // incl_HPHP_UNSET_STATEMENT_H_ diff --git a/hphp/compiler/statement/use_trait_statement.h b/hphp/compiler/statement/use_trait_statement.h index 966f4ef64..9ce065f1d 100644 --- a/hphp/compiler/statement/use_trait_statement.h +++ b/hphp/compiler/statement/use_trait_statement.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __USE_TRAIT_STATEMENT_H__ -#define __USE_TRAIT_STATEMENT_H__ +#ifndef incl_HPHP_USE_TRAIT_STATEMENT_H_ +#define incl_HPHP_USE_TRAIT_STATEMENT_H_ #include #include @@ -52,4 +52,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __USE_TRAIT_STATEMENT_H__ +#endif // incl_HPHP_USE_TRAIT_STATEMENT_H_ diff --git a/hphp/compiler/statement/while_statement.h b/hphp/compiler/statement/while_statement.h index d768443e7..159e8ec3a 100644 --- a/hphp/compiler/statement/while_statement.h +++ b/hphp/compiler/statement/while_statement.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __WHILE_STATEMENT_H__ -#define __WHILE_STATEMENT_H__ +#ifndef incl_HPHP_WHILE_STATEMENT_H_ +#define incl_HPHP_WHILE_STATEMENT_H_ #include @@ -45,4 +45,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __WHILE_STATEMENT_H__ +#endif // incl_HPHP_WHILE_STATEMENT_H_ diff --git a/hphp/compiler/type_annotation.h b/hphp/compiler/type_annotation.h index ca6eeaa5c..469377294 100644 --- a/hphp/compiler/type_annotation.h +++ b/hphp/compiler/type_annotation.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TYPE_ANNOTATION_H__ -#define __TYPE_ANNOTATION_H__ +#ifndef incl_HPHP_TYPEANNOTATION_H_ +#define incl_HPHP_TYPEANNOTATION_H_ #include diff --git a/hphp/hhvm/process_init.h b/hphp/hhvm/process_init.h index 983a3d6fe..c13664729 100644 --- a/hphp/hhvm/process_init.h +++ b/hphp/hhvm/process_init.h @@ -13,8 +13,8 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#ifndef incl_HHVM_PROCESS_INIT_H_ -#define incl_HHVM_PROCESS_INIT_H_ +#ifndef incl_HPHP_HHVM_PROCESS_INIT_H_ +#define incl_HPHP_HHVM_PROCESS_INIT_H_ #include "util/base.h" #include "runtime/base/thread_init_fini.h" diff --git a/hphp/runtime/base/array/array_data.h b/hphp/runtime/base/array/array_data.h index 9ff0948f6..70060557e 100644 --- a/hphp/runtime/base/array/array_data.h +++ b/hphp/runtime/base/array/array_data.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_ARRAY_DATA_H__ -#define __HPHP_ARRAY_DATA_H__ +#ifndef incl_HPHP_ARRAY_DATA_H_ +#define incl_HPHP_ARRAY_DATA_H_ #include #include @@ -500,4 +500,4 @@ void decRefArr(ArrayData* arr) { /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_ARRAY_DATA_H__ +#endif // incl_HPHP_ARRAY_DATA_H_ diff --git a/hphp/runtime/base/array/array_init.h b/hphp/runtime/base/array/array_init.h index 3a0809bdf..476579cbd 100644 --- a/hphp/runtime/base/array/array_init.h +++ b/hphp/runtime/base/array/array_init.h @@ -13,8 +13,8 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#ifndef __ARRAY_INIT_H__ -#define __ARRAY_INIT_H__ +#ifndef incl_HPHP_ARRAY_INIT_H_ +#define incl_HPHP_ARRAY_INIT_H_ #include #include @@ -281,4 +281,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif /* __ARRAY_INIT_H__ */ +#endif /* incl_HPHP_ARRAY_INIT_H_ */ diff --git a/hphp/runtime/base/array/array_inline.h b/hphp/runtime/base/array/array_inline.h index e5a5523b9..b9f85f77c 100644 --- a/hphp/runtime/base/array/array_inline.h +++ b/hphp/runtime/base/array/array_inline.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_ARRAY_INLINE_H__ -#define __HPHP_ARRAY_INLINE_H__ +#ifndef incl_HPHP_ARRAY_INLINE_H_ +#define incl_HPHP_ARRAY_INLINE_H_ #include #include @@ -167,4 +167,4 @@ inline ArrayData* ArrayData::remove(CVarRef k, bool copy) { /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_ARRAY_INLINE_H__ +#endif // incl_HPHP_ARRAY_INLINE_H_ diff --git a/hphp/runtime/base/array/array_iterator.h b/hphp/runtime/base/array/array_iterator.h index d0219dae4..3b2e2c0ce 100644 --- a/hphp/runtime/base/array/array_iterator.h +++ b/hphp/runtime/base/array/array_iterator.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_ARRAY_ITERATOR_H__ -#define __HPHP_ARRAY_ITERATOR_H__ +#ifndef incl_HPHP_ARRAY_ITERATOR_H_ +#define incl_HPHP_ARRAY_ITERATOR_H_ #include #include @@ -478,4 +478,4 @@ namespace VM { /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_ARRAY_ITERATOR_H__ +#endif // incl_HPHP_ARRAY_ITERATOR_H_ diff --git a/hphp/runtime/base/array/array_util.h b/hphp/runtime/base/array/array_util.h index b88bf768a..54b26a851 100644 --- a/hphp/runtime/base/array/array_util.h +++ b/hphp/runtime/base/array/array_util.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_ARRAY_UTIL_H__ -#define __HPHP_ARRAY_UTIL_H__ +#ifndef incl_HPHP_ARRAY_UTIL_H_ +#define incl_HPHP_ARRAY_UTIL_H_ #include #include @@ -206,4 +206,4 @@ public: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_ARRAY_UTIL_H__ +#endif // incl_HPHP_ARRAY_UTIL_H_ diff --git a/hphp/runtime/base/array/hphp_array.h b/hphp/runtime/base/array/hphp_array.h index 9ac0c9066..665c05854 100644 --- a/hphp/runtime/base/array/hphp_array.h +++ b/hphp/runtime/base/array/hphp_array.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_HPHP_ARRAY_H__ -#define __HPHP_HPHP_ARRAY_H__ +#ifndef incl_HPHP_HPHP_ARRAY_H_ +#define incl_HPHP_HPHP_ARRAY_H_ #include #include @@ -551,4 +551,4 @@ ArrayData* array_add(ArrayData* a1, ArrayData* a2); /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_HPHP_ARRAY_H__ +#endif // incl_HPHP_HPHP_ARRAY_H_ diff --git a/hphp/runtime/base/array/sort_helpers.h b/hphp/runtime/base/array/sort_helpers.h index 3391cf0c6..0093a0503 100644 --- a/hphp/runtime/base/array/sort_helpers.h +++ b/hphp/runtime/base/array/sort_helpers.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __SORT_HELPERS_H__ -#define __SORT_HELPERS_H__ +#ifndef incl_HPHP_SORT_HELPERS_H_ +#define incl_HPHP_SORT_HELPERS_H_ #include #include @@ -287,4 +287,4 @@ struct ElmUCompare { /////////////////////////////////////////////////////////////////////////////// } -#endif // __SORT_HELPERS_H__ +#endif // incl_HPHP_SORT_HELPERS_H_ diff --git a/hphp/runtime/base/base_includes.h b/hphp/runtime/base/base_includes.h index c6b4cc58b..a312f41d2 100644 --- a/hphp/runtime/base/base_includes.h +++ b/hphp/runtime/base/base_includes.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_BASE_INCLUDES_H__ -#define __HPHP_BASE_INCLUDES_H__ +#ifndef incl_HPHP_BASE_INCLUDES_H_ +#define incl_HPHP_BASE_INCLUDES_H_ /////////////////////////////////////////////////////////////////////////////// // headers needed by extensions. @@ -31,4 +31,4 @@ #endif /////////////////////////////////////////////////////////////////////////////// -#endif // __HPHP_BASE_INCLUDES_H__ +#endif // incl_HPHP_BASE_INCLUDES_H_ diff --git a/hphp/runtime/base/binary_operations.h b/hphp/runtime/base/binary_operations.h index 57ce76a9a..103062de9 100644 --- a/hphp/runtime/base/binary_operations.h +++ b/hphp/runtime/base/binary_operations.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_BINARY_OPERATIONS_H__ -#define __HPHP_BINARY_OPERATIONS_H__ +#ifndef incl_HPHP_BINARY_OPERATIONS_H_ +#define incl_HPHP_BINARY_OPERATIONS_H_ #include @@ -114,4 +114,4 @@ inline Variant operator*(CVarRef v, CObjRef n) { return Variant(v) *= n;} /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_BINARY_OPERATIONS_H__ +#endif // incl_HPHP_BINARY_OPERATIONS_H_ diff --git a/hphp/runtime/base/bstring.h b/hphp/runtime/base/bstring.h index 31ac2bcc2..88908525b 100644 --- a/hphp/runtime/base/bstring.h +++ b/hphp/runtime/base/bstring.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_BSTRING_H__ -#define __HPHP_BSTRING_H__ +#ifndef incl_HPHP_BSTRING_H_ +#define incl_HPHP_BSTRING_H_ #include @@ -86,4 +86,4 @@ char* bstrrstr(const char* haystack, size_t haystackSize, /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_BSTRING_H__ +#endif // incl_HPHP_BSTRING_H_ diff --git a/hphp/runtime/base/builtin_functions.h b/hphp/runtime/base/builtin_functions.h index 0aa8aa6b8..d1793bb9d 100644 --- a/hphp/runtime/base/builtin_functions.h +++ b/hphp/runtime/base/builtin_functions.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_BUILTIN_FUNCTIONS_H__ -#define __HPHP_BUILTIN_FUNCTIONS_H__ +#ifndef incl_HPHP_BUILTIN_FUNCTIONS_H_ +#define incl_HPHP_BUILTIN_FUNCTIONS_H_ #include #include @@ -596,4 +596,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_BUILTIN_FUNCTIONS_H__ +#endif // incl_HPHP_BUILTIN_FUNCTIONS_H_ diff --git a/hphp/runtime/base/class_info.h b/hphp/runtime/base/class_info.h index faf988ab6..b89a1ced3 100644 --- a/hphp/runtime/base/class_info.h +++ b/hphp/runtime/base/class_info.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_CLASS_INFO_H__ -#define __HPHP_CLASS_INFO_H__ +#ifndef incl_HPHP_CLASS_INFO_H_ +#define incl_HPHP_CLASS_INFO_H_ #include #include @@ -515,4 +515,4 @@ public: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_CLASS_INFO_H__ +#endif // incl_HPHP_CLASS_INFO_H_ diff --git a/hphp/runtime/base/code_coverage.h b/hphp/runtime/base/code_coverage.h index 4301273af..694f7168a 100644 --- a/hphp/runtime/base/code_coverage.h +++ b/hphp/runtime/base/code_coverage.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_EVAL_CODE_COVERAGE_H__ -#define __HPHP_EVAL_CODE_COVERAGE_H__ +#ifndef incl_HPHP_EVAL_CODE_COVERAGE_H_ +#define incl_HPHP_EVAL_CODE_COVERAGE_H_ #include #include @@ -56,4 +56,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_EVAL_CODE_COVERAGE_H__ +#endif // incl_HPHP_EVAL_CODE_COVERAGE_H_ diff --git a/hphp/runtime/base/comparisons.h b/hphp/runtime/base/comparisons.h index dd7c1b22c..7e6615452 100644 --- a/hphp/runtime/base/comparisons.h +++ b/hphp/runtime/base/comparisons.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_COMPARISONS_H__ -#define __HPHP_COMPARISONS_H__ +#ifndef incl_HPHP_COMPARISONS_H_ +#define incl_HPHP_COMPARISONS_H_ #include #include @@ -812,4 +812,4 @@ bool more_or_equal(CVarRef v1, CVarRef v2); /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_COMPARISONS_H__ +#endif // incl_HPHP_COMPARISONS_H_ diff --git a/hphp/runtime/base/complex_types.h b/hphp/runtime/base/complex_types.h index 80997811c..0f207b667 100644 --- a/hphp/runtime/base/complex_types.h +++ b/hphp/runtime/base/complex_types.h @@ -14,10 +14,10 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_COMPLEX_TYPES_H__ -#define __HPHP_COMPLEX_TYPES_H__ +#ifndef incl_HPHP_COMPLEX_TYPES_H_ +#define incl_HPHP_COMPLEX_TYPES_H_ -#define __INSIDE_HPHP_COMPLEX_TYPES_H__ +#define incl_HPHP_INSIDE_HPHP_COMPLEX_TYPES_H_ #include #include @@ -28,6 +28,6 @@ #include #include -#undef __INSIDE_HPHP_COMPLEX_TYPES_H__ +#undef incl_HPHP_INSIDE_HPHP_COMPLEX_TYPES_H_ -#endif // __HPHP_COMPLEX_TYPES_H__ +#endif // incl_HPHP_COMPLEX_TYPES_H_ diff --git a/hphp/runtime/base/debuggable.h b/hphp/runtime/base/debuggable.h index db0161d8b..e9d42d0d9 100644 --- a/hphp/runtime/base/debuggable.h +++ b/hphp/runtime/base/debuggable.h @@ -13,8 +13,8 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#ifndef __HPHP_DEBUGGABLE_H__ -#define __HPHP_DEBUGGABLE_H__ +#ifndef incl_HPHP_DEBUGGABLE_H_ +#define incl_HPHP_DEBUGGABLE_H_ #include #include @@ -120,4 +120,4 @@ HPHPD_SETTINGS /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_DEBUGGABLE_H__ +#endif // incl_HPHP_DEBUGGABLE_H_ diff --git a/hphp/runtime/base/execution_context.h b/hphp/runtime/base/execution_context.h index 102a4e5f9..6baa16dfd 100644 --- a/hphp/runtime/base/execution_context.h +++ b/hphp/runtime/base/execution_context.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_EXECUTION_CONTEXT_H__ -#define __HPHP_EXECUTION_CONTEXT_H__ +#ifndef incl_HPHP_EXECUTION_CONTEXT_H_ +#define incl_HPHP_EXECUTION_CONTEXT_H_ #include #include @@ -816,4 +816,4 @@ extern DECLARE_THREAD_LOCAL_NO_CHECK(PersistentObjectStore, /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_EXECUTION_CONTEXT_H__ +#endif // incl_HPHP_EXECUTION_CONTEXT_H_ diff --git a/hphp/runtime/base/externals.h b/hphp/runtime/base/externals.h index 9b1084bd7..8781d0ec1 100644 --- a/hphp/runtime/base/externals.h +++ b/hphp/runtime/base/externals.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __CPP_BASE_EXTERNALS_H__ -#define __CPP_BASE_EXTERNALS_H__ +#ifndef incl_HPHP_CPP_BASE_EXTERNALS_H_ +#define incl_HPHP_CPP_BASE_EXTERNALS_H_ /////////////////////////////////////////////////////////////////////////////// @@ -76,4 +76,4 @@ extern StaticString literalStrings[]; /////////////////////////////////////////////////////////////////////////////// } -#endif // __CPP_BASE_HPHP_H__ +#endif // incl_HPHP_CPP_BASE_HPHP_H_ diff --git a/hphp/runtime/base/file/bzip2_file.h b/hphp/runtime/base/file/bzip2_file.h index 613aa5934..ed143b009 100644 --- a/hphp/runtime/base/file/bzip2_file.h +++ b/hphp/runtime/base/file/bzip2_file.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __BZIP2_FILE_H__ -#define __BZIP2_FILE_H__ +#ifndef incl_HPHP_BZIP2_FILE_H_ +#define incl_HPHP_BZIP2_FILE_H_ #include #include @@ -58,4 +58,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __BZIP2_FILE_H__ +#endif // incl_HPHP_BZIP2_FILE_H_ diff --git a/hphp/runtime/base/file/file.h b/hphp/runtime/base/file/file.h index 945e58bd0..2af6fa663 100644 --- a/hphp/runtime/base/file/file.h +++ b/hphp/runtime/base/file/file.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_FILE_H__ -#define __HPHP_FILE_H__ +#ifndef incl_HPHP_FILE_H_ +#define incl_HPHP_FILE_H_ #include #include @@ -183,4 +183,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_FILE_H__ +#endif // incl_HPHP_FILE_H_ diff --git a/hphp/runtime/base/file/mem_file.h b/hphp/runtime/base/file/mem_file.h index 1cde94848..2dc2503c2 100644 --- a/hphp/runtime/base/file/mem_file.h +++ b/hphp/runtime/base/file/mem_file.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_MEM_FILE_H__ -#define __HPHP_MEM_FILE_H__ +#ifndef incl_HPHP_MEM_FILE_H_ +#define incl_HPHP_MEM_FILE_H_ #include #include @@ -65,4 +65,4 @@ protected: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_MEM_FILE_H__ +#endif // incl_HPHP_MEM_FILE_H_ diff --git a/hphp/runtime/base/file/output_file.h b/hphp/runtime/base/file/output_file.h index e28681aa8..5df5a93c0 100644 --- a/hphp/runtime/base/file/output_file.h +++ b/hphp/runtime/base/file/output_file.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_OUTPUT_FILE_H__ -#define __HPHP_OUTPUT_FILE_H__ +#ifndef incl_HPHP_OUTPUT_FILE_H_ +#define incl_HPHP_OUTPUT_FILE_H_ #include @@ -58,4 +58,4 @@ protected: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_OUTPUT_FILE_H__ +#endif // incl_HPHP_OUTPUT_FILE_H_ diff --git a/hphp/runtime/base/file/pipe.h b/hphp/runtime/base/file/pipe.h index 4745b7e6d..7dc770d78 100644 --- a/hphp/runtime/base/file/pipe.h +++ b/hphp/runtime/base/file/pipe.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_PIPE_H__ -#define __HPHP_PIPE_H__ +#ifndef incl_HPHP_PIPE_H_ +#define incl_HPHP_PIPE_H_ #include @@ -47,4 +47,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_PIPE_H__ +#endif // incl_HPHP_PIPE_H_ diff --git a/hphp/runtime/base/file/plain_file.h b/hphp/runtime/base/file/plain_file.h index 3c5865ac8..dc59e2ea8 100644 --- a/hphp/runtime/base/file/plain_file.h +++ b/hphp/runtime/base/file/plain_file.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_PLAIN_FILE_H__ -#define __HPHP_PLAIN_FILE_H__ +#ifndef incl_HPHP_PLAIN_FILE_H_ +#define incl_HPHP_PLAIN_FILE_H_ #include #include @@ -99,4 +99,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_PLAIN_FILE_H__ +#endif // incl_HPHP_PLAIN_FILE_H_ diff --git a/hphp/runtime/base/file/socket.h b/hphp/runtime/base/file/socket.h index db9d3eda2..31538bb15 100644 --- a/hphp/runtime/base/file/socket.h +++ b/hphp/runtime/base/file/socket.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_SOCKET_H__ -#define __HPHP_SOCKET_H__ +#ifndef incl_HPHP_SOCKET_H_ +#define incl_HPHP_SOCKET_H_ #include #include @@ -90,4 +90,4 @@ protected: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_SOCKET_H__ +#endif // incl_HPHP_SOCKET_H_ diff --git a/hphp/runtime/base/file/ssl_socket.h b/hphp/runtime/base/file/ssl_socket.h index 2123396f4..5cd08ed3f 100644 --- a/hphp/runtime/base/file/ssl_socket.h +++ b/hphp/runtime/base/file/ssl_socket.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_SSL_SOCKET_H__ -#define __HPHP_SSL_SOCKET_H__ +#ifndef incl_HPHP_SSL_SOCKET_H_ +#define incl_HPHP_SSL_SOCKET_H_ #include #include @@ -121,4 +121,4 @@ public: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_SSL_SOCKET_H__ +#endif // incl_HPHP_SSL_SOCKET_H_ diff --git a/hphp/runtime/base/file/temp_file.h b/hphp/runtime/base/file/temp_file.h index f9e13ee0c..fbe5d5d1c 100644 --- a/hphp/runtime/base/file/temp_file.h +++ b/hphp/runtime/base/file/temp_file.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_TEMP_FILE_H__ -#define __HPHP_TEMP_FILE_H__ +#ifndef incl_HPHP_TEMP_FILE_H_ +#define incl_HPHP_TEMP_FILE_H_ #include @@ -51,4 +51,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_TEMP_FILE_H__ +#endif // incl_HPHP_TEMP_FILE_H_ diff --git a/hphp/runtime/base/file/url_file.h b/hphp/runtime/base/file/url_file.h index 1b8934ae9..cbb04e419 100644 --- a/hphp/runtime/base/file/url_file.h +++ b/hphp/runtime/base/file/url_file.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_URL_FILE_H__ -#define __HPHP_URL_FILE_H__ +#ifndef incl_HPHP_URL_FILE_H_ +#define incl_HPHP_URL_FILE_H_ #include #include @@ -58,4 +58,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_URL_FILE_H__ +#endif // incl_HPHP_URL_FILE_H_ diff --git a/hphp/runtime/base/file/zip_file.h b/hphp/runtime/base/file/zip_file.h index de9a30a16..a71829e13 100644 --- a/hphp/runtime/base/file/zip_file.h +++ b/hphp/runtime/base/file/zip_file.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_ZIP_FILE_H__ -#define __HPHP_ZIP_FILE_H__ +#ifndef incl_HPHP_ZIP_FILE_H_ +#define incl_HPHP_ZIP_FILE_H_ #include #include @@ -58,4 +58,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_ZIP_FILE_H__ +#endif // incl_HPHP_ZIP_FILE_H_ diff --git a/hphp/runtime/base/gc_roots.h b/hphp/runtime/base/gc_roots.h index cf42df91b..6c09a148a 100644 --- a/hphp/runtime/base/gc_roots.h +++ b/hphp/runtime/base/gc_roots.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef incl_BASE_GC_ROOTS_H_ -#define incl_BASE_GC_ROOTS_H_ +#ifndef incl_HPHP_BASE_GC_ROOTS_H_ +#define incl_HPHP_BASE_GC_ROOTS_H_ #include #include diff --git a/hphp/runtime/base/hphp.h b/hphp/runtime/base/hphp.h index 0927911c4..f72ffd142 100644 --- a/hphp/runtime/base/hphp.h +++ b/hphp/runtime/base/hphp.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __CPP_BASE_HPHP_H__ -#define __CPP_BASE_HPHP_H__ +#ifndef incl_HPHP_CPP_BASE_HPHP_H_ +#define incl_HPHP_CPP_BASE_HPHP_H_ /////////////////////////////////////////////////////////////////////////////// @@ -32,4 +32,4 @@ /////////////////////////////////////////////////////////////////////////////// -#endif // __CPP_BASE_HPHP_H__ +#endif // incl_HPHP_CPP_BASE_HPHP_H_ diff --git a/hphp/runtime/base/hphp_system.h b/hphp/runtime/base/hphp_system.h index 226274e93..a4052d1d4 100644 --- a/hphp/runtime/base/hphp_system.h +++ b/hphp/runtime/base/hphp_system.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __CPP_BASE_HPHP_SYSTEM_H__ -#define __CPP_BASE_HPHP_SYSTEM_H__ +#ifndef incl_HPHP_CPP_BASE_HPHP_SYSTEM_H_ +#define incl_HPHP_CPP_BASE_HPHP_SYSTEM_H_ /////////////////////////////////////////////////////////////////////////////// @@ -63,4 +63,4 @@ const char* getHphpCompilerId(); /////////////////////////////////////////////////////////////////////////////// -#endif // __CPP_BASE_HPHP_SYSTEM_H__ +#endif // incl_HPHP_CPP_BASE_HPHP_SYSTEM_H_ diff --git a/hphp/runtime/base/hphp_value.h b/hphp/runtime/base/hphp_value.h index b07584a45..348657fa6 100644 --- a/hphp/runtime/base/hphp_value.h +++ b/hphp/runtime/base/hphp_value.h @@ -14,13 +14,13 @@ +----------------------------------------------------------------------+ */ -#ifndef __INSIDE_HPHP_COMPLEX_TYPES_H__ +#ifndef incl_HPHP_INSIDE_HPHP_COMPLEX_TYPES_H_ #error Directly including 'hphp_value.h' is prohibited. \ Include 'complex_types.h' instead. #endif -#ifndef __HPHP_HPHPVALUE_H__ -#define __HPHP_HPHPVALUE_H__ +#ifndef incl_HPHP_HPHPVALUE_H_ +#define incl_HPHP_HPHPVALUE_H_ #include @@ -133,4 +133,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_HPHPVALUE_H__ +#endif // incl_HPHP_HPHPVALUE_H_ diff --git a/hphp/runtime/base/ini_setting.h b/hphp/runtime/base/ini_setting.h index 3d9bf4dac..639d1caf2 100644 --- a/hphp/runtime/base/ini_setting.h +++ b/hphp/runtime/base/ini_setting.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __INI_SETTING_H__ -#define __INI_SETTING_H__ +#ifndef incl_HPHP_INI_SETTING_H_ +#define incl_HPHP_INI_SETTING_H_ #include @@ -65,4 +65,4 @@ bool ini_on_update_string_non_empty(CStrRef value, void *p); /////////////////////////////////////////////////////////////////////////////// } -#endif // __INI_SETTING_H__ +#endif // incl_HPHP_INI_SETTING_H_ diff --git a/hphp/runtime/base/intercept.h b/hphp/runtime/base/intercept.h index a8b758159..f1a7e611b 100644 --- a/hphp/runtime/base/intercept.h +++ b/hphp/runtime/base/intercept.h @@ -13,8 +13,8 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#ifndef __HPHP_INTERCEPT_H__ -#define __HPHP_INTERCEPT_H__ +#ifndef incl_HPHP_INTERCEPT_H_ +#define incl_HPHP_INTERCEPT_H_ #include #include @@ -83,4 +83,4 @@ extern DECLARE_THREAD_LOCAL_NO_CHECK(bool, s_hasRenamedFunction); /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_INTERCEPT_H__ +#endif // incl_HPHP_INTERCEPT_H_ diff --git a/hphp/runtime/base/list_assignment.h b/hphp/runtime/base/list_assignment.h index 876a72427..be4ef8aa9 100644 --- a/hphp/runtime/base/list_assignment.h +++ b/hphp/runtime/base/list_assignment.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_LIST_ASSIGNMENT_H__ -#define __HPHP_LIST_ASSIGNMENT_H__ +#ifndef incl_HPHP_LIST_ASSIGNMENT_H_ +#define incl_HPHP_LIST_ASSIGNMENT_H_ #include @@ -60,4 +60,4 @@ Variant list_assign(CVarRef data, ListAssignmentElement *elem, ...); /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_LIST_ASSIGNMENT_H__ +#endif // incl_HPHP_LIST_ASSIGNMENT_H_ diff --git a/hphp/runtime/base/macros.h b/hphp/runtime/base/macros.h index 1816ce480..cd6655439 100644 --- a/hphp/runtime/base/macros.h +++ b/hphp/runtime/base/macros.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_MACROS_H__ -#define __HPHP_MACROS_H__ +#ifndef incl_HPHP_MACROS_H_ +#define incl_HPHP_MACROS_H_ #include "util/assertions.h" @@ -153,4 +153,4 @@ namespace HPHP { ////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_MACROS_H__ +#endif // incl_HPHP_MACROS_H_ diff --git a/hphp/runtime/base/md5.h b/hphp/runtime/base/md5.h index 3d3244677..5f7042371 100644 --- a/hphp/runtime/base/md5.h +++ b/hphp/runtime/base/md5.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef incl_BASE_MD5_H_ -#define incl_BASE_MD5_H_ +#ifndef incl_HPHP_BASE_MD5_H_ +#define incl_HPHP_BASE_MD5_H_ #include #include diff --git a/hphp/runtime/base/memory/leak_detectable.h b/hphp/runtime/base/memory/leak_detectable.h index 766928d9f..60154e5db 100644 --- a/hphp/runtime/base/memory/leak_detectable.h +++ b/hphp/runtime/base/memory/leak_detectable.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_LEAK_DETECTABLE_H__ -#define __HPHP_LEAK_DETECTABLE_H__ +#ifndef incl_HPHP_LEAK_DETECTABLE_H_ +#define incl_HPHP_LEAK_DETECTABLE_H_ #include #include @@ -87,4 +87,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif /* __HPHP_LEAK_DETECTABLE_H__ */ +#endif /* incl_HPHP_LEAK_DETECTABLE_H_ */ diff --git a/hphp/runtime/base/memory/memory_manager.h b/hphp/runtime/base/memory/memory_manager.h index a09af464a..9f9e6e052 100644 --- a/hphp/runtime/base/memory/memory_manager.h +++ b/hphp/runtime/base/memory/memory_manager.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_MEMORY_MANAGER_H__ -#define __HPHP_MEMORY_MANAGER_H__ +#ifndef incl_HPHP_MEMORY_MANAGER_H_ +#define incl_HPHP_MEMORY_MANAGER_H_ #include #include @@ -523,4 +523,4 @@ struct hash_set : std::tr1::unordered_set< /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_MEMORY_MANAGER_H__ +#endif // incl_HPHP_MEMORY_MANAGER_H_ diff --git a/hphp/runtime/base/memory/memory_usage_stats.h b/hphp/runtime/base/memory/memory_usage_stats.h index 97ac4932f..4051f0c00 100644 --- a/hphp/runtime/base/memory/memory_usage_stats.h +++ b/hphp/runtime/base/memory/memory_usage_stats.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef incl_RUNTIME_BASE_MEMORY_USAGE_STATS_H_ -#define incl_RUNTIME_BASE_MEMORY_USAGE_STATS_H_ +#ifndef incl_HPHP_RUNTIME_BASE_MEMORY_USAGESTATS_H_ +#define incl_HPHP_RUNTIME_BASE_MEMORY_USAGESTATS_H_ namespace HPHP { diff --git a/hphp/runtime/base/memory/smart_allocator.h b/hphp/runtime/base/memory/smart_allocator.h index 7f5cbd602..b7ee3bb3b 100644 --- a/hphp/runtime/base/memory/smart_allocator.h +++ b/hphp/runtime/base/memory/smart_allocator.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_SMART_ALLOCATOR_H__ -#define __HPHP_SMART_ALLOCATOR_H__ +#ifndef incl_HPHP_SMART_ALLOCATOR_H_ +#define incl_HPHP_SMART_ALLOCATOR_H_ #include #include @@ -359,4 +359,4 @@ inline void operator delete(void *p , HPHP::ObjectAllocatorBase *a) { /////////////////////////////////////////////////////////////////////////////// -#endif // __HPHP_SMART_ALLOCATOR_H__ +#endif // incl_HPHP_SMART_ALLOCATOR_H_ diff --git a/hphp/runtime/base/object_data.h b/hphp/runtime/base/object_data.h index 3bd49a2c3..938a51297 100644 --- a/hphp/runtime/base/object_data.h +++ b/hphp/runtime/base/object_data.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_OBJECT_DATA_H__ -#define __HPHP_OBJECT_DATA_H__ +#ifndef incl_HPHP_OBJECT_DATA_H_ +#define incl_HPHP_OBJECT_DATA_H_ #include #include @@ -388,4 +388,4 @@ ALWAYS_INLINE inline void decRefObj(ObjectData* obj) { /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_OBJECT_DATA_H__ +#endif // incl_HPHP_OBJECT_DATA_H_ diff --git a/hphp/runtime/base/preg.h b/hphp/runtime/base/preg.h index 69f8b7a6d..71bc03ac8 100644 --- a/hphp/runtime/base/preg.h +++ b/hphp/runtime/base/preg.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __PREG_H__ -#define __PREG_H_ +#ifndef incl_HPHP_PREG_H__ +#define incl_HPHP_PREG_H_ #include #include @@ -57,4 +57,4 @@ size_t preg_pcre_cache_size(); /////////////////////////////////////////////////////////////////////////////// } -#endif // __PREG_H__ +#endif // incl_HPHP_PREG_H__ diff --git a/hphp/runtime/base/program_functions.h b/hphp/runtime/base/program_functions.h index 9cb9a48ca..cc9a493f5 100644 --- a/hphp/runtime/base/program_functions.h +++ b/hphp/runtime/base/program_functions.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_PROGRAM_FUNCTIONS_H__ -#define __HPHP_PROGRAM_FUNCTIONS_H__ +#ifndef incl_HPHP_PROGRAM_FUNCTIONS_H_ +#define incl_HPHP_PROGRAM_FUNCTIONS_H_ #include #include @@ -89,4 +89,4 @@ extern const char* const kCompilerId; /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_PROGRAM_FUNCTIONS_H__ +#endif // incl_HPHP_PROGRAM_FUNCTIONS_H_ diff --git a/hphp/runtime/base/ref_data.h b/hphp/runtime/base/ref_data.h index 7695631a0..9cc1b31e1 100644 --- a/hphp/runtime/base/ref_data.h +++ b/hphp/runtime/base/ref_data.h @@ -14,13 +14,13 @@ +----------------------------------------------------------------------+ */ -#ifndef __INSIDE_HPHP_COMPLEX_TYPES_H__ +#ifndef incl_HPHP_INSIDE_HPHP_COMPLEX_TYPES_H_ #error Directly including 'ref_data.h' is prohibited. \ Include 'complex_types.h' instead. #endif -#ifndef __HPHP_REF_DATA_H -#define __HPHP_REF_DATA_H +#ifndef incl_HPHP_REF_DATA_H +#define incl_HPHP_REF_DATA_H namespace HPHP { @@ -125,4 +125,4 @@ ALWAYS_INLINE inline void decRefRef(RefData* ref) { } // namespace HPHP -#endif //__HPHP_REF_DATA_H +#endif //incl_HPHP_REF_DATA_H diff --git a/hphp/runtime/base/resource_data.h b/hphp/runtime/base/resource_data.h index 157ac481d..e95b0bff0 100644 --- a/hphp/runtime/base/resource_data.h +++ b/hphp/runtime/base/resource_data.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_RESOURCE_DATA_H__ -#define __HPHP_RESOURCE_DATA_H__ +#ifndef incl_HPHP_RESOURCE_DATA_H_ +#define incl_HPHP_RESOURCE_DATA_H_ #include #include @@ -134,4 +134,4 @@ typedef std::map ResourceMapMap; /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_RESOURCE_DATA_H__ +#endif // incl_HPHP_RESOURCE_DATA_H_ diff --git a/hphp/runtime/base/runtime_error.h b/hphp/runtime/base/runtime_error.h index 1a6c63c95..b4bd01c93 100644 --- a/hphp/runtime/base/runtime_error.h +++ b/hphp/runtime/base/runtime_error.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_RUNTIME_ERROR_H__ -#define __HPHP_RUNTIME_ERROR_H__ +#ifndef incl_HPHP_RUNTIME_ERROR_H_ +#define incl_HPHP_RUNTIME_ERROR_H_ #include #include @@ -96,5 +96,5 @@ warn_or_error(const char* fmt, ...) { /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_RUNTIME_ERROR_H__ +#endif // incl_HPHP_RUNTIME_ERROR_H_ diff --git a/hphp/runtime/base/runtime_option.h b/hphp/runtime/base/runtime_option.h index 7fc4f1c7f..a1fea6a20 100644 --- a/hphp/runtime/base/runtime_option.h +++ b/hphp/runtime/base/runtime_option.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __RUNTIME_OPTION_H__ -#define __RUNTIME_OPTION_H__ +#ifndef incl_HPHP_RUNTIME_OPTION_H_ +#define incl_HPHP_RUNTIME_OPTION_H_ #include #include @@ -505,4 +505,4 @@ public: /////////////////////////////////////////////////////////////////////////////// } -#endif // __RUNTIME_OPTION_H__ +#endif // incl_HPHP_RUNTIME_OPTION_H_ diff --git a/hphp/runtime/base/server/access_log.h b/hphp/runtime/base/server/access_log.h index ca9d122f6..2291b6089 100644 --- a/hphp/runtime/base/server/access_log.h +++ b/hphp/runtime/base/server/access_log.h @@ -13,8 +13,8 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#ifndef __HPHP_ACCESS_LOG_H__ -#define __HPHP_ACCESS_LOG_H__ +#ifndef incl_HPHP_ACCESS_LOG_H_ +#define incl_HPHP_ACCESS_LOG_H_ #include #include @@ -85,4 +85,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_ACCESS_LOG_H__ +#endif // incl_HPHP_ACCESS_LOG_H_ diff --git a/hphp/runtime/base/server/admin_request_handler.h b/hphp/runtime/base/server/admin_request_handler.h index a893d2f53..afd53e6dc 100644 --- a/hphp/runtime/base/server/admin_request_handler.h +++ b/hphp/runtime/base/server/admin_request_handler.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __ADMIN_REQUEST_HANDLER_H__ -#define __ADMIN_REQUEST_HANDLER_H__ +#ifndef incl_HPHP_ADMIN_REQUEST_HANDLER_H_ +#define incl_HPHP_ADMIN_REQUEST_HANDLER_H_ #include #include @@ -63,4 +63,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __ADMIN_REQUEST_HANDLER_H__ +#endif // incl_HPHP_ADMIN_REQUEST_HANDLER_H_ diff --git a/hphp/runtime/base/server/dynamic_content_cache.h b/hphp/runtime/base/server/dynamic_content_cache.h index 6b72c3b9a..aee669442 100644 --- a/hphp/runtime/base/server/dynamic_content_cache.h +++ b/hphp/runtime/base/server/dynamic_content_cache.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __DYNAMIC_CONTENT_CACHE_H__ -#define __DYNAMIC_CONTENT_CACHE_H__ +#ifndef incl_HPHP_DYNAMIC_CONTENT_CACHE_H_ +#define incl_HPHP_DYNAMIC_CONTENT_CACHE_H_ #include #include @@ -57,4 +57,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __DYNAMIC_CONTENT_CACHE_H__ +#endif // incl_HPHP_DYNAMIC_CONTENT_CACHE_H_ diff --git a/hphp/runtime/base/server/files_match.h b/hphp/runtime/base/server/files_match.h index 249a07900..c3f58c763 100644 --- a/hphp/runtime/base/server/files_match.h +++ b/hphp/runtime/base/server/files_match.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __FILES_MATCH_H__ -#define __FILES_MATCH_H__ +#ifndef incl_HPHP_FILES_MATCH_H_ +#define incl_HPHP_FILES_MATCH_H_ #include @@ -38,4 +38,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __FILES_MATCH_H__ +#endif // incl_HPHP_FILES_MATCH_H_ diff --git a/hphp/runtime/base/server/http_protocol.h b/hphp/runtime/base/server/http_protocol.h index 324c4f1ad..bcc581cb2 100644 --- a/hphp/runtime/base/server/http_protocol.h +++ b/hphp/runtime/base/server/http_protocol.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_HTTP_PROTOCOL_H__ -#define __HPHP_HTTP_PROTOCOL_H__ +#ifndef incl_HPHP_HTTP_PROTOCOL_H_ +#define incl_HPHP_HTTP_PROTOCOL_H_ #include #include @@ -59,4 +59,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_HTTP_PROTOCOL_H__ +#endif // incl_HPHP_HTTP_PROTOCOL_H_ diff --git a/hphp/runtime/base/server/http_request_handler.h b/hphp/runtime/base/server/http_request_handler.h index 071e0f8c1..c0fe92a22 100644 --- a/hphp/runtime/base/server/http_request_handler.h +++ b/hphp/runtime/base/server/http_request_handler.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HTTP_REQUEST_HANDLER_H__ -#define __HTTP_REQUEST_HANDLER_H__ +#ifndef incl_HPHP_HTTP_REQUEST_HANDLER_H_ +#define incl_HPHP_HTTP_REQUEST_HANDLER_H_ #include #include @@ -66,4 +66,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HTTP_REQUEST_HANDLER_H__ +#endif // incl_HPHP_HTTP_REQUEST_HANDLER_H_ diff --git a/hphp/runtime/base/server/http_server.h b/hphp/runtime/base/server/http_server.h index ae3304723..9c9c577f6 100644 --- a/hphp/runtime/base/server/http_server.h +++ b/hphp/runtime/base/server/http_server.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HTTP_SERVER_H__ -#define __HTTP_SERVER_H__ +#ifndef incl_HPHP_HTTP_SERVER_H_ +#define incl_HPHP_HTTP_SERVER_H_ #include #include @@ -77,4 +77,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HTTP_SERVER_H__ +#endif // incl_HPHP_HTTP_SERVER_H_ diff --git a/hphp/runtime/base/server/ip_block_map.h b/hphp/runtime/base/server/ip_block_map.h index 49a156095..b3669a1ec 100644 --- a/hphp/runtime/base/server/ip_block_map.h +++ b/hphp/runtime/base/server/ip_block_map.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __IP_BLOCK_MAP_H__ -#define __IP_BLOCK_MAP_H__ +#ifndef incl_HPHP_IP_BLOCK_MAP_H_ +#define incl_HPHP_IP_BLOCK_MAP_H_ #include #include @@ -92,4 +92,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __IP_BLOCK_MAP_H__ +#endif // incl_HPHP_IP_BLOCK_MAP_H_ diff --git a/hphp/runtime/base/server/libevent_server.h b/hphp/runtime/base/server/libevent_server.h index f435afc91..607b56415 100644 --- a/hphp/runtime/base/server/libevent_server.h +++ b/hphp/runtime/base/server/libevent_server.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HTTP_SERVER_LIB_EVENT_SERVER_H__ -#define __HTTP_SERVER_LIB_EVENT_SERVER_H__ +#ifndef incl_HPHP_HTTP_SERVER_LIB_EVENT_SERVER_H_ +#define incl_HPHP_HTTP_SERVER_LIB_EVENT_SERVER_H_ #include #include @@ -205,4 +205,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HTTP_SERVER_LIB_EVENT_SERVER_H__ +#endif // incl_HPHP_HTTP_SERVER_LIB_EVENT_SERVER_H_ diff --git a/hphp/runtime/base/server/libevent_server_with_fd.h b/hphp/runtime/base/server/libevent_server_with_fd.h index 287e7fd19..dec943394 100644 --- a/hphp/runtime/base/server/libevent_server_with_fd.h +++ b/hphp/runtime/base/server/libevent_server_with_fd.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HTTP_SERVER_LIB_EVENT_SERVER_WITH_FD_H__ -#define __HTTP_SERVER_LIB_EVENT_SERVER_WITH_FD_H__ +#ifndef incl_HPHP_HTTP_SERVER_LIB_EVENT_SERVER_WITH_FD_H_ +#define incl_HPHP_HTTP_SERVER_LIB_EVENT_SERVER_WITH_FD_H_ #include @@ -46,4 +46,4 @@ protected: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HTTP_SERVER_LIB_EVENT_SERVER_WITH_FD_H__ +#endif // incl_HPHP_HTTP_SERVER_LIB_EVENT_SERVER_WITH_FD_H_ diff --git a/hphp/runtime/base/server/libevent_server_with_takeover.h b/hphp/runtime/base/server/libevent_server_with_takeover.h index 26fff2f2e..2a9931dfb 100644 --- a/hphp/runtime/base/server/libevent_server_with_takeover.h +++ b/hphp/runtime/base/server/libevent_server_with_takeover.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HTTP_SERVER_LIB_EVENT_SERVER_WITH_TAKEOVER_H__ -#define __HTTP_SERVER_LIB_EVENT_SERVER_WITH_TAKEOVER_H__ +#ifndef incl_HPHP_HTTP_SERVER_LIB_EVENT_SERVER_WITH_TAKEOVER_H_ +#define incl_HPHP_HTTP_SERVER_LIB_EVENT_SERVER_WITH_TAKEOVER_H_ #include @@ -76,4 +76,4 @@ public: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HTTP_SERVER_LIB_EVENT_SERVER_H__ +#endif // incl_HPHP_HTTP_SERVER_LIB_EVENT_SERVER_H_ diff --git a/hphp/runtime/base/server/libevent_transport.h b/hphp/runtime/base/server/libevent_transport.h index df990cf5b..1f7983b36 100644 --- a/hphp/runtime/base/server/libevent_transport.h +++ b/hphp/runtime/base/server/libevent_transport.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HTTP_SERVER_LIB_EVENT_TRANSPORT_H__ -#define __HTTP_SERVER_LIB_EVENT_TRANSPORT_H__ +#ifndef incl_HPHP_HTTP_SERVER_LIB_EVENT_TRANSPORT_H_ +#define incl_HPHP_HTTP_SERVER_LIB_EVENT_TRANSPORT_H_ #include #include @@ -73,4 +73,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HTTP_SERVER_LIB_EVENT_TRANSPORT_H__ +#endif // incl_HPHP_HTTP_SERVER_LIB_EVENT_TRANSPORT_H_ diff --git a/hphp/runtime/base/server/pagelet_server.h b/hphp/runtime/base/server/pagelet_server.h index 1cbcc40b8..d8e9b656c 100644 --- a/hphp/runtime/base/server/pagelet_server.h +++ b/hphp/runtime/base/server/pagelet_server.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_PAGELET_SERVER_H__ -#define __HPHP_PAGELET_SERVER_H__ +#ifndef incl_HPHP_PAGELET_SERVER_H_ +#define incl_HPHP_PAGELET_SERVER_H_ #include @@ -66,4 +66,4 @@ public: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_PAGELET_SERVER_H__ +#endif // incl_HPHP_PAGELET_SERVER_H_ diff --git a/hphp/runtime/base/server/replay_transport.h b/hphp/runtime/base/server/replay_transport.h index c1d495703..c8e6c412a 100644 --- a/hphp/runtime/base/server/replay_transport.h +++ b/hphp/runtime/base/server/replay_transport.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_REPLAY_TRANSPORT_H__ -#define __HPHP_REPLAY_TRANSPORT_H__ +#ifndef incl_HPHP_REPLAY_TRANSPORT_H_ +#define incl_HPHP_REPLAY_TRANSPORT_H_ #include #include @@ -70,4 +70,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_REPLAY_TRANSPORT_H__ +#endif // incl_HPHP_REPLAY_TRANSPORT_H_ diff --git a/hphp/runtime/base/server/request_uri.h b/hphp/runtime/base/server/request_uri.h index 7681a1a00..34c485085 100644 --- a/hphp/runtime/base/server/request_uri.h +++ b/hphp/runtime/base/server/request_uri.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_REQUEST_URI_H__ -#define __HPHP_REQUEST_URI_H__ +#ifndef incl_HPHP_REQUEST_URI_H_ +#define incl_HPHP_REQUEST_URI_H_ #include @@ -95,4 +95,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_REQUEST_URI_H__ +#endif // incl_HPHP_REQUEST_URI_H_ diff --git a/hphp/runtime/base/server/rpc_request_handler.h b/hphp/runtime/base/server/rpc_request_handler.h index f8eefcd13..f9221d5a6 100644 --- a/hphp/runtime/base/server/rpc_request_handler.h +++ b/hphp/runtime/base/server/rpc_request_handler.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_RPC_REQUEST_HANDLER_H__ -#define __HPHP_RPC_REQUEST_HANDLER_H__ +#ifndef incl_HPHP_RPC_REQUEST_HANDLER_H_ +#define incl_HPHP_RPC_REQUEST_HANDLER_H_ #include #include @@ -76,4 +76,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_RPC_REQUEST_HANDLER_H__ +#endif // incl_HPHP_RPC_REQUEST_HANDLER_H_ diff --git a/hphp/runtime/base/server/satellite_server.h b/hphp/runtime/base/server/satellite_server.h index 974607b40..68842ca02 100644 --- a/hphp/runtime/base/server/satellite_server.h +++ b/hphp/runtime/base/server/satellite_server.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_SATELLITE_SERVER_H__ -#define __HPHP_SATELLITE_SERVER_H__ +#ifndef incl_HPHP_SATELLITE_SERVER_H_ +#define incl_HPHP_SATELLITE_SERVER_H_ #include @@ -104,4 +104,4 @@ protected: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_SATELLITE_SERVER_H__ +#endif // incl_HPHP_SATELLITE_SERVER_H_ diff --git a/hphp/runtime/base/server/server.h b/hphp/runtime/base/server/server.h index cbfb3211b..7d6a9fb9e 100644 --- a/hphp/runtime/base/server/server.h +++ b/hphp/runtime/base/server/server.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HTTP_SERVER_SERVER_H__ -#define __HTTP_SERVER_SERVER_H__ +#ifndef incl_HPHP_HTTP_SERVER_SERVER_H_ +#define incl_HPHP_HTTP_SERVER_SERVER_H_ #include #include @@ -258,4 +258,4 @@ public: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HTTP_SERVER_SERVER_H__ +#endif // incl_HPHP_HTTP_SERVER_SERVER_H_ diff --git a/hphp/runtime/base/server/server_note.h b/hphp/runtime/base/server/server_note.h index 26de3bf6a..4a9dfff89 100644 --- a/hphp/runtime/base/server/server_note.h +++ b/hphp/runtime/base/server/server_note.h @@ -13,8 +13,8 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#ifndef __HPHP_SERVER_NOTE_H__ -#define __HPHP_SERVER_NOTE_H__ +#ifndef incl_HPHP_SERVER_NOTE_H_ +#define incl_HPHP_SERVER_NOTE_H_ #include @@ -36,4 +36,4 @@ void get_server_note() ATTRIBUTE_COLD; /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_SERVER_NOTE_H__ +#endif // incl_HPHP_SERVER_NOTE_H_ diff --git a/hphp/runtime/base/server/server_stats.h b/hphp/runtime/base/server/server_stats.h index 2dbaeb7a3..fff20e7a7 100644 --- a/hphp/runtime/base/server/server_stats.h +++ b/hphp/runtime/base/server/server_stats.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_SERVER_STATS_H__ -#define __HPHP_SERVER_STATS_H__ +#ifndef incl_HPHP_SERVERSTATS_H_ +#define incl_HPHP_SERVERSTATS_H_ #include #include @@ -247,4 +247,4 @@ void server_stats_log_mutex(const std::string &stack, int64_t elapsed_us); /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_SERVER_STATS_H__ +#endif // incl_HPHP_SERVERSTATS_H_ diff --git a/hphp/runtime/base/server/service_thread.h b/hphp/runtime/base/server/service_thread.h index 2a1db85cf..77f218a9f 100644 --- a/hphp/runtime/base/server/service_thread.h +++ b/hphp/runtime/base/server/service_thread.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __SERVICE_THREAD_H__ -#define __SERVICE_THREAD_H__ +#ifndef incl_HPHP_SERVICE_THREAD_H_ +#define incl_HPHP_SERVICE_THREAD_H_ #include @@ -47,4 +47,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __SERVICE_THREAD_H__ +#endif // incl_HPHP_SERVICE_THREAD_H_ diff --git a/hphp/runtime/base/server/source_root_info.h b/hphp/runtime/base/server/source_root_info.h index 154116443..4bee8121b 100644 --- a/hphp/runtime/base/server/source_root_info.h +++ b/hphp/runtime/base/server/source_root_info.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_SOURCE_ROOT_INFO_H__ -#define __HPHP_SOURCE_ROOT_INFO_H__ +#ifndef incl_HPHP_SOURCE_ROOT_INFO_H_ +#define incl_HPHP_SOURCE_ROOT_INFO_H_ #include #include @@ -81,4 +81,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_SOURCE_ROOT_INFO_H__ +#endif // incl_HPHP_SOURCE_ROOT_INFO_H_ diff --git a/hphp/runtime/base/server/static_content_cache.h b/hphp/runtime/base/server/static_content_cache.h index 87f7fa6d4..4db785643 100644 --- a/hphp/runtime/base/server/static_content_cache.h +++ b/hphp/runtime/base/server/static_content_cache.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __STATIC_CONTENT_CACHE_H__ -#define __STATIC_CONTENT_CACHE_H__ +#ifndef incl_HPHP_STATIC_CONTENT_CACHE_H_ +#define incl_HPHP_STATIC_CONTENT_CACHE_H_ #include #include @@ -57,4 +57,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __STATIC_CONTENT_CACHE_H__ +#endif // incl_HPHP_STATIC_CONTENT_CACHE_H_ diff --git a/hphp/runtime/base/server/transport.h b/hphp/runtime/base/server/transport.h index 624fd0cc8..1eb2b81f7 100644 --- a/hphp/runtime/base/server/transport.h +++ b/hphp/runtime/base/server/transport.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HTTP_SERVER_TRANSPORT_H__ -#define __HTTP_SERVER_TRANSPORT_H__ +#ifndef incl_HPHP_HTTP_SERVER_TRANSPORT_H_ +#define incl_HPHP_HTTP_SERVER_TRANSPORT_H_ #include #include @@ -428,4 +428,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HTTP_SERVER_TRANSPORT_H__ +#endif // incl_HPHP_HTTP_SERVER_TRANSPORT_H_ diff --git a/hphp/runtime/base/server/upload.h b/hphp/runtime/base/server/upload.h index 1fd90c14a..1388c4d2d 100644 --- a/hphp/runtime/base/server/upload.h +++ b/hphp/runtime/base/server/upload.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_UPLOAD_H__ -#define __HPHP_UPLOAD_H__ +#ifndef incl_HPHP_UPLOAD_H_ +#define incl_HPHP_UPLOAD_H_ #include #include @@ -80,4 +80,4 @@ const std::set &get_uploaded_files(); /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_UPLOAD_H__ +#endif // incl_HPHP_UPLOAD_H_ diff --git a/hphp/runtime/base/server/virtual_host.h b/hphp/runtime/base/server/virtual_host.h index e4e1e8cc9..a2e026dcf 100644 --- a/hphp/runtime/base/server/virtual_host.h +++ b/hphp/runtime/base/server/virtual_host.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __VIRTUAL_HOST_H__ -#define __VIRTUAL_HOST_H__ +#ifndef incl_HPHP_VIRTUAL_HOST_H_ +#define incl_HPHP_VIRTUAL_HOST_H_ #include #include @@ -120,4 +120,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __VIRTUAL_HOST_H__ +#endif // incl_HPHP_VIRTUAL_HOST_H_ diff --git a/hphp/runtime/base/server/xbox_server.h b/hphp/runtime/base/server/xbox_server.h index e3367ce4c..1703f225a 100644 --- a/hphp/runtime/base/server/xbox_server.h +++ b/hphp/runtime/base/server/xbox_server.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_XBOX_SERVER_H__ -#define __HPHP_XBOX_SERVER_H__ +#ifndef incl_HPHP_XBOX_SERVER_H_ +#define incl_HPHP_XBOX_SERVER_H_ #include #include @@ -90,4 +90,4 @@ public: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_XBOX_SERVER_H__ +#endif // incl_HPHP_XBOX_SERVER_H_ diff --git a/hphp/runtime/base/shared/concurrent_shared_store.h b/hphp/runtime/base/shared/concurrent_shared_store.h index 33e9d2f78..7eb7c04c9 100644 --- a/hphp/runtime/base/shared/concurrent_shared_store.h +++ b/hphp/runtime/base/shared/concurrent_shared_store.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_CONCURRENT_SHARED_STORE_H__ -#define __HPHP_CONCURRENT_SHARED_STORE_H__ +#ifndef incl_HPHP_CONCURRENT_SHARED_STORE_H_ +#define incl_HPHP_CONCURRENT_SHARED_STORE_H_ #define TBB_PREVIEW_CONCURRENT_PRIORITY_QUEUE 1 @@ -126,4 +126,4 @@ private: } -#endif /* __HPHP_CONCURRENT_SHARED_STORE_H__ */ +#endif /* incl_HPHP_CONCURRENT_SHARED_STORE_H_ */ diff --git a/hphp/runtime/base/shared/immutable_map.h b/hphp/runtime/base/shared/immutable_map.h index 8fd37009d..cf070336d 100644 --- a/hphp/runtime/base/shared/immutable_map.h +++ b/hphp/runtime/base/shared/immutable_map.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_IMMUTABLE_MAP_H__ -#define __HPHP_IMMUTABLE_MAP_H__ +#ifndef incl_HPHP_IMMUTABLE_MAP_H_ +#define incl_HPHP_IMMUTABLE_MAP_H_ #include #include @@ -94,4 +94,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif /* __HPHP_IMMUTABLE_MAP_H__ */ +#endif /* incl_HPHP_IMMUTABLE_MAP_H_ */ diff --git a/hphp/runtime/base/shared/immutable_obj.h b/hphp/runtime/base/shared/immutable_obj.h index ddd4a8e1b..7512fc8d0 100644 --- a/hphp/runtime/base/shared/immutable_obj.h +++ b/hphp/runtime/base/shared/immutable_obj.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_IMMUTABLE_OBJ_H__ -#define __HPHP_IMMUTABLE_OBJ_H__ +#ifndef incl_HPHP_IMMUTABLE_OBJ_H_ +#define incl_HPHP_IMMUTABLE_OBJ_H_ #include #include @@ -48,4 +48,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif /* __HPHP_IMMUTABLE_OBJ_H__ */ +#endif /* incl_HPHP_IMMUTABLE_OBJ_H_ */ diff --git a/hphp/runtime/base/shared/shared_map.h b/hphp/runtime/base/shared/shared_map.h index 72f514bc4..af69df4a9 100644 --- a/hphp/runtime/base/shared/shared_map.h +++ b/hphp/runtime/base/shared/shared_map.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __SHARED_MAP_H__ -#define __SHARED_MAP_H__ +#ifndef incl_HPHP_SHARED_MAP_H_ +#define incl_HPHP_SHARED_MAP_H_ #include #include @@ -136,4 +136,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __SHARED_MAP_H__ +#endif // incl_HPHP_SHARED_MAP_H_ diff --git a/hphp/runtime/base/shared/shared_store_base.h b/hphp/runtime/base/shared/shared_store_base.h index 025fea06a..4201e5096 100644 --- a/hphp/runtime/base/shared/shared_store_base.h +++ b/hphp/runtime/base/shared/shared_store_base.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_SHARED_STORE_BASE_H__ -#define __HPHP_SHARED_STORE_BASE_H__ +#ifndef incl_HPHP_SHARED_STORE_BASE_H_ +#define incl_HPHP_SHARED_STORE_BASE_H_ #include #include @@ -192,4 +192,4 @@ extern SharedStoreFileStorage s_apc_file_storage; /////////////////////////////////////////////////////////////////////////////// } -#endif /* __HPHP_SHARED_STORE_BASE_H__ */ +#endif /* incl_HPHP_SHARED_STORE_BASE_H_ */ diff --git a/hphp/runtime/base/shared/shared_store_stats.h b/hphp/runtime/base/shared/shared_store_stats.h index 18660866d..7aa4cd27d 100644 --- a/hphp/runtime/base/shared/shared_store_stats.h +++ b/hphp/runtime/base/shared/shared_store_stats.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_SHARED_STORE_STATS_H__ -#define __HPHP_SHARED_STORE_STATS_H__ +#ifndef incl_HPHP_SHARED_STORESTATS_H_ +#define incl_HPHP_SHARED_STORESTATS_H_ #include @@ -155,4 +155,4 @@ protected: /////////////////////////////////////////////////////////////////////////////// } -#endif /* __HPHP_SHARED_STORE_STATS_H__ */ +#endif /* incl_HPHP_SHARED_STORESTATS_H_ */ diff --git a/hphp/runtime/base/shared/shared_string.h b/hphp/runtime/base/shared/shared_string.h index 065e1ea85..dde541a78 100644 --- a/hphp/runtime/base/shared/shared_string.h +++ b/hphp/runtime/base/shared/shared_string.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_CPP_BASE_SHARED_SHARED_STRING_H__ -#define __HPHP_CPP_BASE_SHARED_SHARED_STRING_H__ +#ifndef incl_HPHP_CPP_BASE_SHARED_SHARED_STRING_H_ +#define incl_HPHP_CPP_BASE_SHARED_SHARED_STRING_H_ #include #include @@ -87,4 +87,4 @@ class hphp_shared_string_map : /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_CPP_BASE_SHARED_SHARED_STRING_H__ +#endif // incl_HPHP_CPP_BASE_SHARED_SHARED_STRING_H_ diff --git a/hphp/runtime/base/shared/shared_variant.h b/hphp/runtime/base/shared/shared_variant.h index 5e595af11..849af2093 100644 --- a/hphp/runtime/base/shared/shared_variant.h +++ b/hphp/runtime/base/shared/shared_variant.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_SHARED_VARIANT_H__ -#define __HPHP_SHARED_VARIANT_H__ +#ifndef incl_HPHP_SHARED_VARIANT_H_ +#define incl_HPHP_SHARED_VARIANT_H_ #include #include @@ -272,4 +272,4 @@ class SharedVariantStats { /////////////////////////////////////////////////////////////////////////////// } -#endif /* __HPHP_SHARED_VARIANT_H__ */ +#endif /* incl_HPHP_SHARED_VARIANT_H_ */ diff --git a/hphp/runtime/base/sort_flags.h b/hphp/runtime/base/sort_flags.h index 334df0aa3..865f24913 100644 --- a/hphp/runtime/base/sort_flags.h +++ b/hphp/runtime/base/sort_flags.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef incl_SORT_FLAGS_H_ -#define incl_SORT_FLAGS_H_ +#ifndef incl_HPHP_SORT_FLAGS_H_ +#define incl_HPHP_SORT_FLAGS_H_ namespace HPHP { @@ -31,5 +31,5 @@ enum SortFlags { } -#endif // incl_SORT_FLAGS_H_ +#endif // incl_HPHP_SORT_FLAGS_H_ diff --git a/hphp/runtime/base/stat_cache.h b/hphp/runtime/base/stat_cache.h index ac86fd603..64f27744c 100644 --- a/hphp/runtime/base/stat_cache.h +++ b/hphp/runtime/base/stat_cache.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __STAT_CACHE_H__ -#define __STAT_CACHE_H__ +#ifndef incl_HPHP_STAT_CACHE_H_ +#define incl_HPHP_STAT_CACHE_H_ #include @@ -129,4 +129,4 @@ class StatCache { /////////////////////////////////////////////////////////////////////////////// } -#endif // __STAT_CACHE_H__ +#endif // incl_HPHP_STAT_CACHE_H_ diff --git a/hphp/runtime/base/string_data.h b/hphp/runtime/base/string_data.h index 6faf320d8..bcb0108fe 100644 --- a/hphp/runtime/base/string_data.h +++ b/hphp/runtime/base/string_data.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_STRING_DATA_H__ -#define __HPHP_STRING_DATA_H__ +#ifndef incl_HPHP_STRING_DATA_H_ +#define incl_HPHP_STRING_DATA_H_ #include #include @@ -463,4 +463,4 @@ ALWAYS_INLINE inline void decRefStr(StringData* s) { /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_STRING_DATA_H__ +#endif // incl_HPHP_STRING_DATA_H_ diff --git a/hphp/runtime/base/string_offset.h b/hphp/runtime/base/string_offset.h index 5ceb52e1d..a91185fdb 100644 --- a/hphp/runtime/base/string_offset.h +++ b/hphp/runtime/base/string_offset.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_STRING_OFFSET_H__ -#define __HPHP_STRING_OFFSET_H__ +#ifndef incl_HPHP_STRING_OFFSET_H_ +#define incl_HPHP_STRING_OFFSET_H_ #include #include @@ -64,4 +64,4 @@ class StringOffset { /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_STRING_OFFSET_H__ +#endif // incl_HPHP_STRING_OFFSET_H_ diff --git a/hphp/runtime/base/string_util.h b/hphp/runtime/base/string_util.h index 69f2f7899..f9bb53f8a 100644 --- a/hphp/runtime/base/string_util.h +++ b/hphp/runtime/base/string_util.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_STRING_UTIL_H__ -#define __HPHP_STRING_UTIL_H__ +#ifndef incl_HPHP_STRING_UTIL_H_ +#define incl_HPHP_STRING_UTIL_H_ #include @@ -134,4 +134,4 @@ public: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_STRING_UTIL_H__ +#endif // incl_HPHP_STRING_UTIL_H_ diff --git a/hphp/runtime/base/strings.h b/hphp/runtime/base/strings.h index 3e0f3d06c..00eb87ccb 100644 --- a/hphp/runtime/base/strings.h +++ b/hphp/runtime/base/strings.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_STRINGS_H__ -#define __HPHP_STRINGS_H__ +#ifndef incl_HPHP_STRINGS_H_ +#define incl_HPHP_STRINGS_H_ namespace HPHP { namespace Strings { @@ -64,4 +64,4 @@ const char* const OP_NOT_SUPPORTED_STRING = } // namespace Strings } // namespace HPHP -#endif // __HPHP_STRINGS_H__ +#endif // incl_HPHP_STRINGS_H_ diff --git a/hphp/runtime/base/thread_init_fini.h b/hphp/runtime/base/thread_init_fini.h index 1e4906635..58fde9fb9 100644 --- a/hphp/runtime/base/thread_init_fini.h +++ b/hphp/runtime/base/thread_init_fini.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_THREAD_INIT_FINI_H__ -#define __HPHP_THREAD_INIT_FINI_H__ +#ifndef incl_HPHP_THREAD_INIT_FINI_H_ +#define incl_HPHP_THREAD_INIT_FINI_H_ #include @@ -42,4 +42,4 @@ struct InitFiniNode { /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_THREAD_INIT_FINI_H__ +#endif // incl_HPHP_THREAD_INIT_FINI_H_ diff --git a/hphp/runtime/base/time/dateinterval.h b/hphp/runtime/base/time/dateinterval.h index c87d59fae..42eb9a6b7 100644 --- a/hphp/runtime/base/time/dateinterval.h +++ b/hphp/runtime/base/time/dateinterval.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_DATEINTERVAL_H__ -#define __HPHP_DATEINTERVAL_H__ +#ifndef incl_HPHP_DATEINTERVAL_H_ +#define incl_HPHP_DATEINTERVAL_H_ #include #include @@ -123,4 +123,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_DATEINTERVAL_H__ +#endif // incl_HPHP_DATEINTERVAL_H_ diff --git a/hphp/runtime/base/time/datetime.h b/hphp/runtime/base/time/datetime.h index 747f444df..0ae52af51 100644 --- a/hphp/runtime/base/time/datetime.h +++ b/hphp/runtime/base/time/datetime.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_DATETIME_H__ -#define __HPHP_DATETIME_H__ +#ifndef incl_HPHP_DATETIME_H_ +#define incl_HPHP_DATETIME_H_ #include #include @@ -356,4 +356,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_DATETIME_H__ +#endif // incl_HPHP_DATETIME_H_ diff --git a/hphp/runtime/base/time/timestamp.h b/hphp/runtime/base/time/timestamp.h index bb3da8a00..f381a561b 100644 --- a/hphp/runtime/base/time/timestamp.h +++ b/hphp/runtime/base/time/timestamp.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_TIMESTAMP_H__ -#define __HPHP_TIMESTAMP_H__ +#ifndef incl_HPHP_TIMESTAMP_H_ +#define incl_HPHP_TIMESTAMP_H_ #include @@ -43,4 +43,4 @@ public: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_TIMESTAMP_H__ +#endif // incl_HPHP_TIMESTAMP_H_ diff --git a/hphp/runtime/base/time/timezone.h b/hphp/runtime/base/time/timezone.h index d1eb10e19..f46a9f0d6 100644 --- a/hphp/runtime/base/time/timezone.h +++ b/hphp/runtime/base/time/timezone.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_TIMEZONE_H__ -#define __HPHP_TIMEZONE_H__ +#ifndef incl_HPHP_TIMEZONE_H_ +#define incl_HPHP_TIMEZONE_H_ #include #include @@ -143,4 +143,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_TIMEZONE_H__ +#endif // incl_HPHP_TIMEZONE_H_ diff --git a/hphp/runtime/base/timeout_thread.h b/hphp/runtime/base/timeout_thread.h index 764514c9d..062028f4b 100644 --- a/hphp/runtime/base/timeout_thread.h +++ b/hphp/runtime/base/timeout_thread.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TIMEOUT_THREAD_H__ -#define __TIMEOUT_THREAD_H__ +#ifndef incl_HPHP_TIMEOUT_THREAD_H_ +#define incl_HPHP_TIMEOUT_THREAD_H_ #include @@ -71,5 +71,5 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __TIMEOUT_THREAD_H__ +#endif // incl_HPHP_TIMEOUT_THREAD_H_ diff --git a/hphp/runtime/base/tv_helpers.h b/hphp/runtime/base/tv_helpers.h index fdccdb64a..445e7f489 100644 --- a/hphp/runtime/base/tv_helpers.h +++ b/hphp/runtime/base/tv_helpers.h @@ -14,13 +14,13 @@ +----------------------------------------------------------------------+ */ -#ifndef __INSIDE_HPHP_COMPLEX_TYPES_H__ +#ifndef incl_HPHP_INSIDE_HPHP_COMPLEX_TYPES_H_ #error Directly including 'tv_helpers.h' is prohibited. \ Include 'complex_types.h' instead. #endif -#ifndef __HPHP_TV_HELPERS_H__ -#define __HPHP_TV_HELPERS_H__ +#ifndef incl_HPHP_TV_HELPERS_H_ +#define incl_HPHP_TV_HELPERS_H_ #include @@ -465,4 +465,4 @@ extern const RawDestructor g_destructors[kDestrTableSize]; /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_TV_HELPERS_H__ +#endif // incl_HPHP_TV_HELPERS_H_ diff --git a/hphp/runtime/base/type_array.h b/hphp/runtime/base/type_array.h index 58e1e2d75..8c18810f0 100644 --- a/hphp/runtime/base/type_array.h +++ b/hphp/runtime/base/type_array.h @@ -14,13 +14,13 @@ +----------------------------------------------------------------------+ */ -#ifndef __INSIDE_HPHP_COMPLEX_TYPES_H__ +#ifndef incl_HPHP_INSIDE_HPHP_COMPLEX_TYPES_H_ #error Directly including 'type_array.h' is prohibited. \ Include 'complex_types.h' instead. #endif -#ifndef __HPHP_ARRAY_H__ -#define __HPHP_ARRAY_H__ +#ifndef incl_HPHP_ARRAY_H_ +#define incl_HPHP_ARRAY_H_ #include @@ -609,4 +609,4 @@ protected: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_ARRAY_H__ +#endif // incl_HPHP_ARRAY_H_ diff --git a/hphp/runtime/base/type_conversions.h b/hphp/runtime/base/type_conversions.h index afef7a843..0ba4e037d 100644 --- a/hphp/runtime/base/type_conversions.h +++ b/hphp/runtime/base/type_conversions.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_TYPE_CONVERSIONS_H__ -#define __HPHP_TYPE_CONVERSIONS_H__ +#ifndef incl_HPHP_TYPE_CONVERSIONS_H_ +#define incl_HPHP_TYPE_CONVERSIONS_H_ #include #include @@ -187,4 +187,4 @@ inline const Object *toOPOD(CObjRef v) { return &v;} /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_TYPE_CONVERSIONS_H__ +#endif // incl_HPHP_TYPE_CONVERSIONS_H_ diff --git a/hphp/runtime/base/type_object.h b/hphp/runtime/base/type_object.h index b36977a6d..47a2faec6 100644 --- a/hphp/runtime/base/type_object.h +++ b/hphp/runtime/base/type_object.h @@ -14,13 +14,13 @@ +----------------------------------------------------------------------+ */ -#ifndef __INSIDE_HPHP_COMPLEX_TYPES_H__ +#ifndef incl_HPHP_INSIDE_HPHP_COMPLEX_TYPES_H_ #error Directly including 'type_object.h' is prohibited. \ Include 'complex_types.h' instead. #endif -#ifndef __HPHP_OBJECT_H__ -#define __HPHP_OBJECT_H__ +#ifndef incl_HPHP_OBJECT_H_ +#define incl_HPHP_OBJECT_H_ #include #include @@ -230,4 +230,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_OBJECT_H__ +#endif // incl_HPHP_OBJECT_H_ diff --git a/hphp/runtime/base/type_string.h b/hphp/runtime/base/type_string.h index e6d6b44ca..e1fa2c893 100644 --- a/hphp/runtime/base/type_string.h +++ b/hphp/runtime/base/type_string.h @@ -14,13 +14,13 @@ +----------------------------------------------------------------------+ */ -#ifndef __INSIDE_HPHP_COMPLEX_TYPES_H__ +#ifndef incl_HPHP_INSIDE_HPHP_COMPLEX_TYPES_H_ #error Directly including 'type_string.h' is prohibited. \ Include 'complex_types.h' instead. #endif -#ifndef __HPHP_STRING_H__ -#define __HPHP_STRING_H__ +#ifndef incl_HPHP_STRING_H_ +#define incl_HPHP_STRING_H_ #include #include @@ -624,4 +624,4 @@ extern const StaticString empty_string; /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_STRING_H__ +#endif // incl_HPHP_STRING_H_ diff --git a/hphp/runtime/base/type_variant.h b/hphp/runtime/base/type_variant.h index c1635c345..6cff427ed 100644 --- a/hphp/runtime/base/type_variant.h +++ b/hphp/runtime/base/type_variant.h @@ -14,13 +14,13 @@ +----------------------------------------------------------------------+ */ -#ifndef __INSIDE_HPHP_COMPLEX_TYPES_H__ +#ifndef incl_HPHP_INSIDE_HPHP_COMPLEX_TYPES_H_ #error Directly including 'type_variant.h' is prohibited. \ Include 'complex_types.h' instead. #endif -#ifndef __HPHP_VARIANT_H__ -#define __HPHP_VARIANT_H__ +#ifndef incl_HPHP_VARIANT_H_ +#define incl_HPHP_VARIANT_H_ #include @@ -1543,4 +1543,4 @@ inline Variant uninit_null() { /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_VARIANT_H__ +#endif // incl_HPHP_VARIANT_H_ diff --git a/hphp/runtime/base/types.h b/hphp/runtime/base/types.h index 59be67cd4..c43852a32 100644 --- a/hphp/runtime/base/types.h +++ b/hphp/runtime/base/types.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_TYPES_H__ -#define __HPHP_TYPES_H__ +#ifndef incl_HPHP_TYPES_H_ +#define incl_HPHP_TYPES_H_ #include #include @@ -589,4 +589,4 @@ public: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_TYPES_H__ +#endif // incl_HPHP_TYPES_H_ diff --git a/hphp/runtime/base/util/countable.h b/hphp/runtime/base/util/countable.h index ba7677f69..f9abd2298 100644 --- a/hphp/runtime/base/util/countable.h +++ b/hphp/runtime/base/util/countable.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_COUNTABLE_H__ -#define __HPHP_COUNTABLE_H__ +#ifndef incl_HPHP_COUNTABLE_H_ +#define incl_HPHP_COUNTABLE_H_ #include #include @@ -156,4 +156,4 @@ class AtomicCountable { /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_COUNTABLE_H__ +#endif // incl_HPHP_COUNTABLE_H_ diff --git a/hphp/runtime/base/util/curl_tls_workarounds.h b/hphp/runtime/base/util/curl_tls_workarounds.h index 31cc3ff8c..bd8fdb785 100644 --- a/hphp/runtime/base/util/curl_tls_workarounds.h +++ b/hphp/runtime/base/util/curl_tls_workarounds.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __CURL_TLS_WORKAROUNDS_H__ -#define __CURL_TLS_WORKAROUNDS_H__ +#ifndef incl_HPHP_CURL_TLS_WORKAROUNDS_H_ +#define incl_HPHP_CURL_TLS_WORKAROUNDS_H_ #include @@ -23,6 +23,6 @@ namespace HPHP { CURLcode curl_tls_workarounds_cb(CURL *curl, void *sslctx, void *parm); -#endif // __CURL_TLS_WORKAROUNDS_H__ +#endif // incl_HPHP_CURL_TLS_WORKAROUNDS_H_ } diff --git a/hphp/runtime/base/util/exceptions.h b/hphp/runtime/base/util/exceptions.h index 142126d7e..59fb75e37 100644 --- a/hphp/runtime/base/util/exceptions.h +++ b/hphp/runtime/base/util/exceptions.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __CPP_BASE_EXCEPTIONS_H__ -#define __CPP_BASE_EXCEPTIONS_H__ +#ifndef incl_HPHP_CPP_BASE_EXCEPTIONS_H_ +#define incl_HPHP_CPP_BASE_EXCEPTIONS_H_ #include #include @@ -314,4 +314,4 @@ void throw_null_pointer_exception() ATTRIBUTE_COLD ATTRIBUTE_NORETURN; /////////////////////////////////////////////////////////////////////////////// } -#endif // __CPP_BASE_EXCEPTIONS_H__ +#endif // incl_HPHP_CPP_BASE_EXCEPTIONS_H_ diff --git a/hphp/runtime/base/util/extended_logger.h b/hphp/runtime/base/util/extended_logger.h index 6593317c7..b405b4418 100644 --- a/hphp/runtime/base/util/extended_logger.h +++ b/hphp/runtime/base/util/extended_logger.h @@ -13,8 +13,8 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#ifndef __RUNTIME_BASE_EXTENDED_LOGGER_H__ -#define __RUNTIME_BASE_EXTENDED_LOGGER_H__ +#ifndef incl_HPHP_RUNTIME_BASE_EXTENDED_LOGGER_H_ +#define incl_HPHP_RUNTIME_BASE_EXTENDED_LOGGER_H_ #include #include @@ -68,4 +68,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __RUNTIME_BASE_EXTENDED_LOGGER_H__ +#endif // incl_HPHP_RUNTIME_BASE_EXTENDED_LOGGER_H_ diff --git a/hphp/runtime/base/util/http_client.h b/hphp/runtime/base/util/http_client.h index cbf851d81..79c518bf9 100644 --- a/hphp/runtime/base/util/http_client.h +++ b/hphp/runtime/base/util/http_client.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HTTP_CLIENT_H__ -#define __HTTP_CLIENT_H__ +#ifndef incl_HPHP_HTTP_CLIENT_H_ +#define incl_HPHP_HTTP_CLIENT_H_ #include #include @@ -98,4 +98,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HTTP_CLIENT_H__ +#endif // incl_HPHP_HTTP_CLIENT_H_ diff --git a/hphp/runtime/base/util/libevent_http_client.h b/hphp/runtime/base/util/libevent_http_client.h index 186cfa7d5..85211e0df 100644 --- a/hphp/runtime/base/util/libevent_http_client.h +++ b/hphp/runtime/base/util/libevent_http_client.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __LIBEVENT_HTTP_CLIENT_H__ -#define __LIBEVENT_HTTP_CLIENT_H__ +#ifndef incl_HPHP_LIBEVENT_HTTP_CLIENT_H_ +#define incl_HPHP_LIBEVENT_HTTP_CLIENT_H_ #include #include @@ -117,4 +117,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __LIBEVENT_HTTP_CLIENT_H__ +#endif // incl_HPHP_LIBEVENT_HTTP_CLIENT_H_ diff --git a/hphp/runtime/base/util/php_thrift_buffer.h b/hphp/runtime/base/util/php_thrift_buffer.h index 1cfcddf40..daef86003 100644 --- a/hphp/runtime/base/util/php_thrift_buffer.h +++ b/hphp/runtime/base/util/php_thrift_buffer.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_PHP_THRIFT_BUFFER_H__ -#define __HPHP_PHP_THRIFT_BUFFER_H__ +#ifndef incl_HPHP_PHP_THRIFT_BUFFER_H_ +#define incl_HPHP_PHP_THRIFT_BUFFER_H_ #include @@ -51,4 +51,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_PHP_THRIFT_BUFFER_H__ +#endif // incl_HPHP_PHP_THRIFT_BUFFER_H_ diff --git a/hphp/runtime/base/util/request_local.h b/hphp/runtime/base/util/request_local.h index b3b8abaf1..bef9450d4 100644 --- a/hphp/runtime/base/util/request_local.h +++ b/hphp/runtime/base/util/request_local.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_REQUEST_LOCAL_H__ -#define __HPHP_REQUEST_LOCAL_H__ +#ifndef incl_HPHP_REQUEST_LOCAL_H_ +#define incl_HPHP_REQUEST_LOCAL_H_ #include @@ -163,4 +163,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_REQUEST_LOCAL_H__ +#endif // incl_HPHP_REQUEST_LOCAL_H_ diff --git a/hphp/runtime/base/util/simple_counter.h b/hphp/runtime/base/util/simple_counter.h index f959db29c..9b9bb7997 100644 --- a/hphp/runtime/base/util/simple_counter.h +++ b/hphp/runtime/base/util/simple_counter.h @@ -13,8 +13,8 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#ifndef __HPHP_SIMPLE_COUNTER_H__ -#define __HPHP_SIMPLE_COUNTER_H__ +#ifndef incl_HPHP_SIMPLE_COUNTER_H_ +#define incl_HPHP_SIMPLE_COUNTER_H_ #include #include diff --git a/hphp/runtime/base/util/smart_object.h b/hphp/runtime/base/util/smart_object.h index e227914ff..659bbee85 100644 --- a/hphp/runtime/base/util/smart_object.h +++ b/hphp/runtime/base/util/smart_object.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_SMART_OBJECT_H__ -#define __HPHP_SMART_OBJECT_H__ +#ifndef incl_HPHP_SMART_OBJECT_H_ +#define incl_HPHP_SMART_OBJECT_H_ #include #include diff --git a/hphp/runtime/base/util/smart_ptr.h b/hphp/runtime/base/util/smart_ptr.h index 5b5eb6c0f..3443a4e7a 100644 --- a/hphp/runtime/base/util/smart_ptr.h +++ b/hphp/runtime/base/util/smart_ptr.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_SMART_PTR_H__ -#define __HPHP_SMART_PTR_H__ +#ifndef incl_HPHP_SMART_PTR_H_ +#define incl_HPHP_SMART_PTR_H_ #include #include @@ -245,4 +245,4 @@ protected: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_SMART_PTR_H__ +#endif // incl_HPHP_SMART_PTR_H_ diff --git a/hphp/runtime/base/util/string_buffer.h b/hphp/runtime/base/util/string_buffer.h index 5a723f496..f709ceb7b 100644 --- a/hphp/runtime/base/util/string_buffer.h +++ b/hphp/runtime/base/util/string_buffer.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_STRING_BUFFER_H__ -#define __HPHP_STRING_BUFFER_H__ +#ifndef incl_HPHP_STRING_BUFFER_H_ +#define incl_HPHP_STRING_BUFFER_H_ #include #include @@ -189,4 +189,4 @@ inline const char* CstrBuffer::data() const { /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_STRING_BUFFER_H__ +#endif // incl_HPHP_STRING_BUFFER_H_ diff --git a/hphp/runtime/base/util/thrift_buffer.h b/hphp/runtime/base/util/thrift_buffer.h index b9ee4e665..d78586683 100644 --- a/hphp/runtime/base/util/thrift_buffer.h +++ b/hphp/runtime/base/util/thrift_buffer.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_THRIFT_BUFFER_H__ -#define __HPHP_THRIFT_BUFFER_H__ +#ifndef incl_HPHP_THRIFT_BUFFER_H_ +#define incl_HPHP_THRIFT_BUFFER_H_ #include #include @@ -283,4 +283,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_THRIFT_BUFFER_H__ +#endif // incl_HPHP_THRIFT_BUFFER_H_ diff --git a/hphp/runtime/base/variable_serializer.h b/hphp/runtime/base/variable_serializer.h index 5aee04916..eb09c0d23 100644 --- a/hphp/runtime/base/variable_serializer.h +++ b/hphp/runtime/base/variable_serializer.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_VARIABLE_SERIALIZER_H__ -#define __HPHP_VARIABLE_SERIALIZER_H__ +#ifndef incl_HPHP_VARIABLE_SERIALIZER_H_ +#define incl_HPHP_VARIABLE_SERIALIZER_H_ #include #include @@ -141,4 +141,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_VARIABLE_SERIALIZER_H__ +#endif // incl_HPHP_VARIABLE_SERIALIZER_H_ diff --git a/hphp/runtime/base/variable_unserializer.h b/hphp/runtime/base/variable_unserializer.h index e9491ef78..047077d7f 100644 --- a/hphp/runtime/base/variable_unserializer.h +++ b/hphp/runtime/base/variable_unserializer.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_VARIABLE_UNSERIALIZER_H__ -#define __HPHP_VARIABLE_UNSERIALIZER_H__ +#ifndef incl_HPHP_VARIABLE_UNSERIALIZER_H_ +#define incl_HPHP_VARIABLE_UNSERIALIZER_H_ #include @@ -145,4 +145,4 @@ public: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_VARIABLE_UNSERIALIZER_H__ +#endif // incl_HPHP_VARIABLE_UNSERIALIZER_H_ diff --git a/hphp/runtime/base/zend/intl_convert.h b/hphp/runtime/base/zend/intl_convert.h index 065abadb0..6695ae787 100644 --- a/hphp/runtime/base/zend/intl_convert.h +++ b/hphp/runtime/base/zend/intl_convert.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_INTL_CONVERT_H__ -#define __HPHP_INTL_CONVERT_H__ +#ifndef incl_HPHP_INTL_CONVERT_H_ +#define incl_HPHP_INTL_CONVERT_H_ #include #include @@ -34,4 +34,4 @@ void intl_convert_utf16_to_utf8(char** target, int* target_len, /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_INTL_CONVERT_H__ +#endif // incl_HPHP_INTL_CONVERT_H_ diff --git a/hphp/runtime/base/zend/utf8_decode.h b/hphp/runtime/base/zend/utf8_decode.h index b6529213c..126e5f7fa 100644 --- a/hphp/runtime/base/zend/utf8_decode.h +++ b/hphp/runtime/base/zend/utf8_decode.h @@ -16,8 +16,8 @@ */ /* utf8_decode.h */ -#ifndef __HPHP_ZEND_UTF8_DECODE_H__ -#define __HPHP_ZEND_UTF8_DECODE_H__ +#ifndef incl_HPHP_ZEND_UTF8_DECODE_H_ +#define incl_HPHP_ZEND_UTF8_DECODE_H_ #define UTF8_END -1 #define UTF8_ERROR -2 @@ -47,4 +47,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_ZEND_UTF8_DECODE_H__ +#endif // incl_HPHP_ZEND_UTF8_DECODE_H_ diff --git a/hphp/runtime/base/zend/zend_collator.h b/hphp/runtime/base/zend/zend_collator.h index e4a3e2bef..c98c04411 100644 --- a/hphp/runtime/base/zend/zend_collator.h +++ b/hphp/runtime/base/zend/zend_collator.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_ZEND_COLLATOR_H__ -#define __HPHP_ZEND_COLLATOR_H__ +#ifndef incl_HPHP_ZEND_COLLATOR_H_ +#define incl_HPHP_ZEND_COLLATOR_H_ #include #include @@ -65,4 +65,4 @@ bool collator_asort(Variant &array, int sort_flags, bool ascending, /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_ZEND_COLLATOR_H__ +#endif // incl_HPHP_ZEND_COLLATOR_H_ diff --git a/hphp/runtime/base/zend/zend_functions.h b/hphp/runtime/base/zend/zend_functions.h index 05a371f10..4f15a1181 100644 --- a/hphp/runtime/base/zend/zend_functions.h +++ b/hphp/runtime/base/zend/zend_functions.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_ZEND_FUNCTIONS_H__ -#define __HPHP_ZEND_FUNCTIONS_H__ +#ifndef incl_HPHP_ZEND_FUNCTIONS_H_ +#define incl_HPHP_ZEND_FUNCTIONS_H_ #include #include @@ -49,4 +49,4 @@ conv_10(register int64_t num, register int *is_negative, char *buf_end, /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_ZEND_FUNCTIONS_H__ +#endif // incl_HPHP_ZEND_FUNCTIONS_H_ diff --git a/hphp/runtime/base/zend/zend_math.h b/hphp/runtime/base/zend/zend_math.h index e8509dc30..72261a8e8 100644 --- a/hphp/runtime/base/zend/zend_math.h +++ b/hphp/runtime/base/zend/zend_math.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_ZEND_MATH_H__ -#define __HPHP_ZEND_MATH_H__ +#ifndef incl_HPHP_ZEND_MATH_H_ +#define incl_HPHP_ZEND_MATH_H_ #include @@ -177,4 +177,4 @@ void zend_get_rand_data() ATTRIBUTE_COLD; /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_ZEND_MATH_H__ +#endif // incl_HPHP_ZEND_MATH_H_ diff --git a/hphp/runtime/base/zend/zend_pack.h b/hphp/runtime/base/zend/zend_pack.h index b0a6d026a..a054166f0 100644 --- a/hphp/runtime/base/zend/zend_pack.h +++ b/hphp/runtime/base/zend/zend_pack.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_ZEND_PACK_H__ -#define __HPHP_ZEND_PACK_H__ +#ifndef incl_HPHP_ZEND_PACK_H_ +#define incl_HPHP_ZEND_PACK_H_ #include @@ -83,4 +83,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_ZEND_PACK_H__ +#endif // incl_HPHP_ZEND_PACK_H_ diff --git a/hphp/runtime/base/zend/zend_printf.h b/hphp/runtime/base/zend/zend_printf.h index ce8114cfa..1032f7934 100644 --- a/hphp/runtime/base/zend/zend_printf.h +++ b/hphp/runtime/base/zend/zend_printf.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_ZEND_PRINTF_H__ -#define __HPHP_ZEND_PRINTF_H__ +#ifndef incl_HPHP_ZEND_PRINTF_H_ +#define incl_HPHP_ZEND_PRINTF_H_ #include @@ -35,4 +35,4 @@ int spprintf(char **pbuf, size_t max_len, const char *format, ...); /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_ZEND_PRINTF_H__ +#endif // incl_HPHP_ZEND_PRINTF_H_ diff --git a/hphp/runtime/base/zend/zend_qsort.h b/hphp/runtime/base/zend/zend_qsort.h index 5bf77ab5c..ecdd5fc7b 100644 --- a/hphp/runtime/base/zend/zend_qsort.h +++ b/hphp/runtime/base/zend/zend_qsort.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_ZEND_QSORT_H__ -#define __HPHP_ZEND_QSORT_H__ +#ifndef incl_HPHP_ZEND_QSORT_H_ +#define incl_HPHP_ZEND_QSORT_H_ #include #include @@ -33,4 +33,4 @@ void zend_qsort(void *base, size_t nmemb, size_t siz, /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_ZEND_QSORT_H__ +#endif // incl_HPHP_ZEND_QSORT_H_ diff --git a/hphp/runtime/base/zend/zend_scanf.h b/hphp/runtime/base/zend/zend_scanf.h index 07ff73281..54a6c269d 100644 --- a/hphp/runtime/base/zend/zend_scanf.h +++ b/hphp/runtime/base/zend/zend_scanf.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_ZEND_SCANF_H__ -#define __HPHP_ZEND_SCANF_H__ +#ifndef incl_HPHP_ZEND_SCANF_H_ +#define incl_HPHP_ZEND_SCANF_H_ #include @@ -40,4 +40,4 @@ int string_sscanf(const char *string, const char *format, int numVars, /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_ZEND_SCANF_H__ +#endif // incl_HPHP_ZEND_SCANF_H_ diff --git a/hphp/runtime/base/zend/zend_string.cpp b/hphp/runtime/base/zend/zend_string.cpp index 65634b4c8..05c26c411 100644 --- a/hphp/runtime/base/zend/zend_string.cpp +++ b/hphp/runtime/base/zend/zend_string.cpp @@ -2998,8 +2998,8 @@ char *string_convert_cyrillic_string(const char *input, int length, /////////////////////////////////////////////////////////////////////////////// // Hebrew -#define _HEB_BLOCK_TYPE_ENG 1 -#define _HEB_BLOCK_TYPE_HEB 2 +#define HEB_BLOCK_TYPE_ENG 1 +#define HEB_BLOCK_TYPE_HEB 2 #define isheb(c) \ (((((unsigned char) c) >= 224) && (((unsigned char) c) <= 250)) ? 1 : 0) @@ -3038,13 +3038,13 @@ char *string_convert_hebrew_string(const char *str, int &str_len, block_length=0; if (isheb(*tmp)) { - block_type = _HEB_BLOCK_TYPE_HEB; + block_type = HEB_BLOCK_TYPE_HEB; } else { - block_type = _HEB_BLOCK_TYPE_ENG; + block_type = HEB_BLOCK_TYPE_ENG; } do { - if (block_type == _HEB_BLOCK_TYPE_HEB) { + if (block_type == HEB_BLOCK_TYPE_HEB) { while ((isheb((int)*(tmp+1)) || _isblank((int)*(tmp+1)) || ispunct((int)*(tmp+1)) || @@ -3071,7 +3071,7 @@ char *string_convert_hebrew_string(const char *str, int &str_len, } target--; } - block_type = _HEB_BLOCK_TYPE_ENG; + block_type = HEB_BLOCK_TYPE_ENG; } else { while (!isheb(*(tmp+1)) && (int)*(tmp+1)!='\n' && block_end < str_len-1) { @@ -3089,7 +3089,7 @@ char *string_convert_hebrew_string(const char *str, int &str_len, *target = str[i]; target--; } - block_type = _HEB_BLOCK_TYPE_HEB; + block_type = HEB_BLOCK_TYPE_HEB; } block_start=block_end+1; } while (block_end < str_len-1); diff --git a/hphp/runtime/base/zend/zend_string.h b/hphp/runtime/base/zend/zend_string.h index 7b7addb06..1a9661207 100644 --- a/hphp/runtime/base/zend/zend_string.h +++ b/hphp/runtime/base/zend/zend_string.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_ZEND_STRING_H__ -#define __HPHP_ZEND_STRING_H__ +#ifndef incl_HPHP_ZEND_STRING_H_ +#define incl_HPHP_ZEND_STRING_H_ #include #include @@ -295,4 +295,4 @@ void string_charmask(const char *input, int len, char *mask); /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_ZEND_STRING_H__ +#endif // incl_HPHP_ZEND_STRING_H_ diff --git a/hphp/runtime/base/zend/zend_strtod.h b/hphp/runtime/base/zend/zend_strtod.h index 029998016..02baa8889 100644 --- a/hphp/runtime/base/zend/zend_strtod.h +++ b/hphp/runtime/base/zend/zend_strtod.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_ZEND_STRTOD_H__ -#define __HPHP_ZEND_STRTOD_H__ +#ifndef incl_HPHP_ZEND_STRTOD_H_ +#define incl_HPHP_ZEND_STRTOD_H_ #include @@ -37,4 +37,4 @@ void zend_get_bigint_data() ATTRIBUTE_COLD; /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_ZEND_STRTOD_H__ +#endif // incl_HPHP_ZEND_STRTOD_H_ diff --git a/hphp/runtime/base/zend/zend_url.h b/hphp/runtime/base/zend/zend_url.h index d53dcd377..f6a27fbc6 100644 --- a/hphp/runtime/base/zend/zend_url.h +++ b/hphp/runtime/base/zend/zend_url.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_ZEND_URL_H__ -#define __HPHP_ZEND_URL_H__ +#ifndef incl_HPHP_ZEND_URL_H_ +#define incl_HPHP_ZEND_URL_H_ #include @@ -55,4 +55,4 @@ char *url_raw_decode(const char *s, int &len); /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_ZEND_URL_H__ +#endif // incl_HPHP_ZEND_URL_H_ diff --git a/hphp/runtime/eval/debugger/break_point.h b/hphp/runtime/eval/debugger/break_point.h index 71a86dd1c..0978f8e02 100644 --- a/hphp/runtime/eval/debugger/break_point.h +++ b/hphp/runtime/eval/debugger/break_point.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_EVAL_DEBUGGER_BREAK_POINT_H__ -#define __HPHP_EVAL_DEBUGGER_BREAK_POINT_H__ +#ifndef incl_HPHP_EVAL_DEBUGGER_BREAK_POINT_H_ +#define incl_HPHP_EVAL_DEBUGGER_BREAK_POINT_H_ #include @@ -227,4 +227,4 @@ private: /////////////////////////////////////////////////////////////////////////////// }} -#endif // __HPHP_EVAL_DEBUGGER_BREAK_POINT_H__ +#endif // incl_HPHP_EVAL_DEBUGGER_BREAK_POINT_H_ diff --git a/hphp/runtime/eval/debugger/cmd/all.h b/hphp/runtime/eval/debugger/cmd/all.h index b02b1c59d..ab93a3915 100644 --- a/hphp/runtime/eval/debugger/cmd/all.h +++ b/hphp/runtime/eval/debugger/cmd/all.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_EVAL_DEBUGGER_CMD_ALL_H__ -#define __HPHP_EVAL_DEBUGGER_CMD_ALL_H__ +#ifndef incl_HPHP_EVAL_DEBUGGER_CMD_ALL_H_ +#define incl_HPHP_EVAL_DEBUGGER_CMD_ALL_H_ #include #include @@ -55,4 +55,4 @@ #include //tag: new_cmd.php inserts new command here, do NOT remove/modify this line -#endif // __HPHP_EVAL_DEBUGGER_CMD_ALL_H__ +#endif // incl_HPHP_EVAL_DEBUGGER_CMD_ALL_H_ diff --git a/hphp/runtime/eval/debugger/cmd/cmd_abort.h b/hphp/runtime/eval/debugger/cmd/cmd_abort.h index 95afdf008..32617e22c 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_abort.h +++ b/hphp/runtime/eval/debugger/cmd/cmd_abort.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_EVAL_DEBUGGER_CMD_ABORT_H__ -#define __HPHP_EVAL_DEBUGGER_CMD_ABORT_H__ +#ifndef incl_HPHP_EVAL_DEBUGGER_CMD_ABORT_H_ +#define incl_HPHP_EVAL_DEBUGGER_CMD_ABORT_H_ #include @@ -34,4 +34,4 @@ public: /////////////////////////////////////////////////////////////////////////////// }} -#endif // __HPHP_EVAL_DEBUGGER_CMD_ABORT_H__ +#endif // incl_HPHP_EVAL_DEBUGGER_CMD_ABORT_H_ diff --git a/hphp/runtime/eval/debugger/cmd/cmd_break.h b/hphp/runtime/eval/debugger/cmd/cmd_break.h index d1f69381b..3965fb4b3 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_break.h +++ b/hphp/runtime/eval/debugger/cmd/cmd_break.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_EVAL_DEBUGGER_CMD_BREAK_H__ -#define __HPHP_EVAL_DEBUGGER_CMD_BREAK_H__ +#ifndef incl_HPHP_EVAL_DEBUGGER_CMD_BREAK_H_ +#define incl_HPHP_EVAL_DEBUGGER_CMD_BREAK_H_ #include @@ -63,4 +63,4 @@ private: /////////////////////////////////////////////////////////////////////////////// }} -#endif // __HPHP_EVAL_DEBUGGER_CMD_BREAK_H__ +#endif // incl_HPHP_EVAL_DEBUGGER_CMD_BREAK_H_ diff --git a/hphp/runtime/eval/debugger/cmd/cmd_complete.h b/hphp/runtime/eval/debugger/cmd/cmd_complete.h index 7fef2649f..478affda0 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_complete.h +++ b/hphp/runtime/eval/debugger/cmd/cmd_complete.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_EVAL_DEBUGGER_CMD_COMPLETE_H__ -#define __HPHP_EVAL_DEBUGGER_CMD_COMPLETE_H__ +#ifndef incl_HPHP_EVAL_DEBUGGER_CMD_COMPLETE_H_ +#define incl_HPHP_EVAL_DEBUGGER_CMD_COMPLETE_H_ #include @@ -42,4 +42,4 @@ private: /////////////////////////////////////////////////////////////////////////////// }} -#endif // __HPHP_EVAL_DEBUGGER_CMD_COMPLETE_H__ +#endif // incl_HPHP_EVAL_DEBUGGER_CMD_COMPLETE_H_ diff --git a/hphp/runtime/eval/debugger/cmd/cmd_config.h b/hphp/runtime/eval/debugger/cmd/cmd_config.h index 72307b410..ed93114b2 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_config.h +++ b/hphp/runtime/eval/debugger/cmd/cmd_config.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_EVAL_DEBUGGER_CMD_CONFIG_H__ -#define __HPHP_EVAL_DEBUGGER_CMD_CONFIG_H__ +#ifndef incl_HPHP_EVAL_DEBUGGER_CMD_CONFIG_H_ +#define incl_HPHP_EVAL_DEBUGGER_CMD_CONFIG_H_ #include @@ -37,4 +37,4 @@ private: /////////////////////////////////////////////////////////////////////////////// }} -#endif // __HPHP_EVAL_DEBUGGER_CMD_CONFIG_H__ +#endif // incl_HPHP_EVAL_DEBUGGER_CMD_CONFIG_H_ diff --git a/hphp/runtime/eval/debugger/cmd/cmd_constant.h b/hphp/runtime/eval/debugger/cmd/cmd_constant.h index 7f916678d..09e8db225 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_constant.h +++ b/hphp/runtime/eval/debugger/cmd/cmd_constant.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_EVAL_DEBUGGER_CMD_CONSTANT_H__ -#define __HPHP_EVAL_DEBUGGER_CMD_CONSTANT_H__ +#ifndef incl_HPHP_EVAL_DEBUGGER_CMD_CONSTANT_H_ +#define incl_HPHP_EVAL_DEBUGGER_CMD_CONSTANT_H_ #include @@ -43,4 +43,4 @@ private: /////////////////////////////////////////////////////////////////////////////// }} -#endif // __HPHP_EVAL_DEBUGGER_CMD_CONSTANT_H__ +#endif // incl_HPHP_EVAL_DEBUGGER_CMD_CONSTANT_H_ diff --git a/hphp/runtime/eval/debugger/cmd/cmd_continue.h b/hphp/runtime/eval/debugger/cmd/cmd_continue.h index 223573e74..203eb29f8 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_continue.h +++ b/hphp/runtime/eval/debugger/cmd/cmd_continue.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_EVAL_DEBUGGER_CMD_CONTINUE_H__ -#define __HPHP_EVAL_DEBUGGER_CMD_CONTINUE_H__ +#ifndef incl_HPHP_EVAL_DEBUGGER_CMD_CONTINUE_H_ +#define incl_HPHP_EVAL_DEBUGGER_CMD_CONTINUE_H_ #include @@ -33,4 +33,4 @@ public: /////////////////////////////////////////////////////////////////////////////// }} -#endif // __HPHP_EVAL_DEBUGGER_CMD_CONTINUE_H__ +#endif // incl_HPHP_EVAL_DEBUGGER_CMD_CONTINUE_H_ diff --git a/hphp/runtime/eval/debugger/cmd/cmd_down.h b/hphp/runtime/eval/debugger/cmd/cmd_down.h index ba3ed7892..ad65b5123 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_down.h +++ b/hphp/runtime/eval/debugger/cmd/cmd_down.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_EVAL_DEBUGGER_CMD_DOWN_H__ -#define __HPHP_EVAL_DEBUGGER_CMD_DOWN_H__ +#ifndef incl_HPHP_EVAL_DEBUGGER_CMD_DOWN_H_ +#define incl_HPHP_EVAL_DEBUGGER_CMD_DOWN_H_ #include @@ -35,4 +35,4 @@ public: /////////////////////////////////////////////////////////////////////////////// }} -#endif // __HPHP_EVAL_DEBUGGER_CMD_DOWN_H__ +#endif // incl_HPHP_EVAL_DEBUGGER_CMD_DOWN_H_ diff --git a/hphp/runtime/eval/debugger/cmd/cmd_eval.h b/hphp/runtime/eval/debugger/cmd/cmd_eval.h index e0f7091bf..6271218b4 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_eval.h +++ b/hphp/runtime/eval/debugger/cmd/cmd_eval.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_EVAL_DEBUGGER_CMD_EVAL_H__ -#define __HPHP_EVAL_DEBUGGER_CMD_EVAL_H__ +#ifndef incl_HPHP_EVAL_DEBUGGER_CMD_EVAL_H_ +#define incl_HPHP_EVAL_DEBUGGER_CMD_EVAL_H_ #include @@ -46,4 +46,4 @@ private: /////////////////////////////////////////////////////////////////////////////// }} -#endif // __HPHP_EVAL_DEBUGGER_CMD_EVAL_H__ +#endif // incl_HPHP_EVAL_DEBUGGER_CMD_EVAL_H_ diff --git a/hphp/runtime/eval/debugger/cmd/cmd_example.h b/hphp/runtime/eval/debugger/cmd/cmd_example.h index 3d02b87cb..ae25390c2 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_example.h +++ b/hphp/runtime/eval/debugger/cmd/cmd_example.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_EVAL_DEBUGGER_CMD_EXAMPLE_H__ -#define __HPHP_EVAL_DEBUGGER_CMD_EXAMPLE_H__ +#ifndef incl_HPHP_EVAL_DEBUGGER_CMD_EXAMPLE_H_ +#define incl_HPHP_EVAL_DEBUGGER_CMD_EXAMPLE_H_ #include @@ -42,4 +42,4 @@ private: /////////////////////////////////////////////////////////////////////////////// }} -#endif // __HPHP_EVAL_DEBUGGER_CMD_EXAMPLE_H__ +#endif // incl_HPHP_EVAL_DEBUGGER_CMD_EXAMPLE_H_ diff --git a/hphp/runtime/eval/debugger/cmd/cmd_exception.h b/hphp/runtime/eval/debugger/cmd/cmd_exception.h index 1f21c8e9f..ce683c869 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_exception.h +++ b/hphp/runtime/eval/debugger/cmd/cmd_exception.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_EVAL_DEBUGGER_CMD_EXCEPTION_H__ -#define __HPHP_EVAL_DEBUGGER_CMD_EXCEPTION_H__ +#ifndef incl_HPHP_EVAL_DEBUGGER_CMD_EXCEPTION_H_ +#define incl_HPHP_EVAL_DEBUGGER_CMD_EXCEPTION_H_ #include @@ -38,4 +38,4 @@ public: /////////////////////////////////////////////////////////////////////////////// }} -#endif // __HPHP_EVAL_DEBUGGER_CMD_EXCEPTION_H__ +#endif // incl_HPHP_EVAL_DEBUGGER_CMD_EXCEPTION_H_ diff --git a/hphp/runtime/eval/debugger/cmd/cmd_extended.h b/hphp/runtime/eval/debugger/cmd/cmd_extended.h index 4584a82f0..ff8b1cee3 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_extended.h +++ b/hphp/runtime/eval/debugger/cmd/cmd_extended.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_EVAL_DEBUGGER_CMD_EXTENDED_H__ -#define __HPHP_EVAL_DEBUGGER_CMD_EXTENDED_H__ +#ifndef incl_HPHP_EVAL_DEBUGGER_CMD_EXTENDED_H_ +#define incl_HPHP_EVAL_DEBUGGER_CMD_EXTENDED_H_ #include @@ -57,4 +57,4 @@ private: /////////////////////////////////////////////////////////////////////////////// }} -#endif // __HPHP_EVAL_DEBUGGER_CMD_EXTENDED_H__ +#endif // incl_HPHP_EVAL_DEBUGGER_CMD_EXTENDED_H_ diff --git a/hphp/runtime/eval/debugger/cmd/cmd_extension.h b/hphp/runtime/eval/debugger/cmd/cmd_extension.h index a7375084c..7c5388765 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_extension.h +++ b/hphp/runtime/eval/debugger/cmd/cmd_extension.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_EVAL_DEBUGGER_CMD_EXTENSION_H__ -#define __HPHP_EVAL_DEBUGGER_CMD_EXTENSION_H__ +#ifndef incl_HPHP_EVAL_DEBUGGER_CMD_EXTENSION_H_ +#define incl_HPHP_EVAL_DEBUGGER_CMD_EXTENSION_H_ #include @@ -45,4 +45,4 @@ private: /////////////////////////////////////////////////////////////////////////////// }} -#endif // __HPHP_EVAL_DEBUGGER_CMD_EXTENSION_H__ +#endif // incl_HPHP_EVAL_DEBUGGER_CMD_EXTENSION_H_ diff --git a/hphp/runtime/eval/debugger/cmd/cmd_flow_control.h b/hphp/runtime/eval/debugger/cmd/cmd_flow_control.h index c6457c24a..aa573ecb1 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_flow_control.h +++ b/hphp/runtime/eval/debugger/cmd/cmd_flow_control.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_EVAL_DEBUGGER_CMD_FLOW_CONTROL_H__ -#define __HPHP_EVAL_DEBUGGER_CMD_FLOW_CONTROL_H__ +#ifndef incl_HPHP_EVAL_DEBUGGER_CMD_FLOW_CONTROL_H_ +#define incl_HPHP_EVAL_DEBUGGER_CMD_FLOW_CONTROL_H_ #include @@ -63,4 +63,4 @@ private: /////////////////////////////////////////////////////////////////////////////// }} -#endif // __HPHP_EVAL_DEBUGGER_CMD_FLOW_CONTROL_H__ +#endif // incl_HPHP_EVAL_DEBUGGER_CMD_FLOW_CONTROL_H_ diff --git a/hphp/runtime/eval/debugger/cmd/cmd_frame.h b/hphp/runtime/eval/debugger/cmd/cmd_frame.h index fe9f005b6..df4d1cccf 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_frame.h +++ b/hphp/runtime/eval/debugger/cmd/cmd_frame.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_EVAL_DEBUGGER_CMD_FRAME_H__ -#define __HPHP_EVAL_DEBUGGER_CMD_FRAME_H__ +#ifndef incl_HPHP_EVAL_DEBUGGER_CMD_FRAME_H_ +#define incl_HPHP_EVAL_DEBUGGER_CMD_FRAME_H_ #include @@ -35,4 +35,4 @@ public: /////////////////////////////////////////////////////////////////////////////// }} -#endif // __HPHP_EVAL_DEBUGGER_CMD_FRAME_H__ +#endif // incl_HPHP_EVAL_DEBUGGER_CMD_FRAME_H_ diff --git a/hphp/runtime/eval/debugger/cmd/cmd_global.h b/hphp/runtime/eval/debugger/cmd/cmd_global.h index ef1d1ecad..9ce2f32af 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_global.h +++ b/hphp/runtime/eval/debugger/cmd/cmd_global.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_EVAL_DEBUGGER_CMD_GLOBAL_H__ -#define __HPHP_EVAL_DEBUGGER_CMD_GLOBAL_H__ +#ifndef incl_HPHP_EVAL_DEBUGGER_CMD_GLOBAL_H_ +#define incl_HPHP_EVAL_DEBUGGER_CMD_GLOBAL_H_ #include @@ -43,4 +43,4 @@ private: /////////////////////////////////////////////////////////////////////////////// }} -#endif // __HPHP_EVAL_DEBUGGER_CMD_GLOBAL_H__ +#endif // incl_HPHP_EVAL_DEBUGGER_CMD_GLOBAL_H_ diff --git a/hphp/runtime/eval/debugger/cmd/cmd_help.h b/hphp/runtime/eval/debugger/cmd/cmd_help.h index e191e3fa7..9307168a8 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_help.h +++ b/hphp/runtime/eval/debugger/cmd/cmd_help.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_EVAL_DEBUGGER_CMD_HELP_H__ -#define __HPHP_EVAL_DEBUGGER_CMD_HELP_H__ +#ifndef incl_HPHP_EVAL_DEBUGGER_CMD_HELP_H_ +#define incl_HPHP_EVAL_DEBUGGER_CMD_HELP_H_ #include @@ -42,4 +42,4 @@ private: /////////////////////////////////////////////////////////////////////////////// }} -#endif // __HPHP_EVAL_DEBUGGER_CMD_HELP_H__ +#endif // incl_HPHP_EVAL_DEBUGGER_CMD_HELP_H_ diff --git a/hphp/runtime/eval/debugger/cmd/cmd_info.h b/hphp/runtime/eval/debugger/cmd/cmd_info.h index 9019971f2..2ae863017 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_info.h +++ b/hphp/runtime/eval/debugger/cmd/cmd_info.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_EVAL_DEBUGGER_CMD_INFO_H__ -#define __HPHP_EVAL_DEBUGGER_CMD_INFO_H__ +#ifndef incl_HPHP_EVAL_DEBUGGER_CMD_INFO_H_ +#define incl_HPHP_EVAL_DEBUGGER_CMD_INFO_H_ #include @@ -80,4 +80,4 @@ private: /////////////////////////////////////////////////////////////////////////////// }} -#endif // __HPHP_EVAL_DEBUGGER_CMD_INFO_H__ +#endif // incl_HPHP_EVAL_DEBUGGER_CMD_INFO_H_ diff --git a/hphp/runtime/eval/debugger/cmd/cmd_instrument.h b/hphp/runtime/eval/debugger/cmd/cmd_instrument.h index 466020068..abcf51742 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_instrument.h +++ b/hphp/runtime/eval/debugger/cmd/cmd_instrument.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_EVAL_DEBUGGER_CMD_INSTRUMENT_H__ -#define __HPHP_EVAL_DEBUGGER_CMD_INSTRUMENT_H__ +#ifndef incl_HPHP_EVAL_DEBUGGER_CMD_INSTRUMENT_H_ +#define incl_HPHP_EVAL_DEBUGGER_CMD_INSTRUMENT_H_ #include #include @@ -67,4 +67,4 @@ private: /////////////////////////////////////////////////////////////////////////////// }} -#endif // __HPHP_EVAL_DEBUGGER_CMD_INSTRUMENT_H__ +#endif // incl_HPHP_EVAL_DEBUGGER_CMD_INSTRUMENT_H_ diff --git a/hphp/runtime/eval/debugger/cmd/cmd_interrupt.h b/hphp/runtime/eval/debugger/cmd/cmd_interrupt.h index f600b4747..17f349c99 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_interrupt.h +++ b/hphp/runtime/eval/debugger/cmd/cmd_interrupt.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_EVAL_DEBUGGER_CMD_INTERRUPT_H__ -#define __HPHP_EVAL_DEBUGGER_CMD_INTERRUPT_H__ +#ifndef incl_HPHP_EVAL_DEBUGGER_CMD_INTERRUPT_H_ +#define incl_HPHP_EVAL_DEBUGGER_CMD_INTERRUPT_H_ #include #include @@ -73,4 +73,4 @@ private: /////////////////////////////////////////////////////////////////////////////// }} -#endif // __HPHP_EVAL_DEBUGGER_CMD_INTERRUPT_H__ +#endif // incl_HPHP_EVAL_DEBUGGER_CMD_INTERRUPT_H_ diff --git a/hphp/runtime/eval/debugger/cmd/cmd_jump.h b/hphp/runtime/eval/debugger/cmd/cmd_jump.h index 700503d15..001496c61 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_jump.h +++ b/hphp/runtime/eval/debugger/cmd/cmd_jump.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_EVAL_DEBUGGER_CMD_JUMP_H__ -#define __HPHP_EVAL_DEBUGGER_CMD_JUMP_H__ +#ifndef incl_HPHP_EVAL_DEBUGGER_CMD_JUMP_H_ +#define incl_HPHP_EVAL_DEBUGGER_CMD_JUMP_H_ #include @@ -49,4 +49,4 @@ private: /////////////////////////////////////////////////////////////////////////////// }} -#endif // __HPHP_EVAL_DEBUGGER_CMD_JUMP_H__ +#endif // incl_HPHP_EVAL_DEBUGGER_CMD_JUMP_H_ diff --git a/hphp/runtime/eval/debugger/cmd/cmd_list.h b/hphp/runtime/eval/debugger/cmd/cmd_list.h index 069f4f7ed..a4b5011df 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_list.h +++ b/hphp/runtime/eval/debugger/cmd/cmd_list.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_EVAL_DEBUGGER_CMD_LIST_H__ -#define __HPHP_EVAL_DEBUGGER_CMD_LIST_H__ +#ifndef incl_HPHP_EVAL_DEBUGGER_CMD_LIST_H_ +#define incl_HPHP_EVAL_DEBUGGER_CMD_LIST_H_ #include @@ -58,4 +58,4 @@ private: /////////////////////////////////////////////////////////////////////////////// }} -#endif // __HPHP_EVAL_DEBUGGER_CMD_LIST_H__ +#endif // incl_HPHP_EVAL_DEBUGGER_CMD_LIST_H_ diff --git a/hphp/runtime/eval/debugger/cmd/cmd_machine.h b/hphp/runtime/eval/debugger/cmd/cmd_machine.h index 97f97609f..689ceba0a 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_machine.h +++ b/hphp/runtime/eval/debugger/cmd/cmd_machine.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_EVAL_DEBUGGER_CMD_MACHINE_H__ -#define __HPHP_EVAL_DEBUGGER_CMD_MACHINE_H__ +#ifndef incl_HPHP_EVAL_DEBUGGER_CMD_MACHINE_H_ +#define incl_HPHP_EVAL_DEBUGGER_CMD_MACHINE_H_ #include @@ -58,4 +58,4 @@ private: /////////////////////////////////////////////////////////////////////////////// }} -#endif // __HPHP_EVAL_DEBUGGER_CMD_MACHINE_H__ +#endif // incl_HPHP_EVAL_DEBUGGER_CMD_MACHINE_H_ diff --git a/hphp/runtime/eval/debugger/cmd/cmd_macro.h b/hphp/runtime/eval/debugger/cmd/cmd_macro.h index 9c4adb1c0..5d7656298 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_macro.h +++ b/hphp/runtime/eval/debugger/cmd/cmd_macro.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_EVAL_DEBUGGER_CMD_MACRO_H__ -#define __HPHP_EVAL_DEBUGGER_CMD_MACRO_H__ +#ifndef incl_HPHP_EVAL_DEBUGGER_CMD_MACRO_H_ +#define incl_HPHP_EVAL_DEBUGGER_CMD_MACRO_H_ #include @@ -38,4 +38,4 @@ private: /////////////////////////////////////////////////////////////////////////////// }} -#endif // __HPHP_EVAL_DEBUGGER_CMD_MACRO_H__ +#endif // incl_HPHP_EVAL_DEBUGGER_CMD_MACRO_H_ diff --git a/hphp/runtime/eval/debugger/cmd/cmd_next.h b/hphp/runtime/eval/debugger/cmd/cmd_next.h index c0a68870e..5612cbc89 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_next.h +++ b/hphp/runtime/eval/debugger/cmd/cmd_next.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_EVAL_DEBUGGER_CMD_NEXT_H__ -#define __HPHP_EVAL_DEBUGGER_CMD_NEXT_H__ +#ifndef incl_HPHP_EVAL_DEBUGGER_CMD_NEXT_H_ +#define incl_HPHP_EVAL_DEBUGGER_CMD_NEXT_H_ #include @@ -33,4 +33,4 @@ public: /////////////////////////////////////////////////////////////////////////////// }} -#endif // __HPHP_EVAL_DEBUGGER_CMD_NEXT_H__ +#endif // incl_HPHP_EVAL_DEBUGGER_CMD_NEXT_H_ diff --git a/hphp/runtime/eval/debugger/cmd/cmd_out.h b/hphp/runtime/eval/debugger/cmd/cmd_out.h index 87b09f85e..79e95e3ac 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_out.h +++ b/hphp/runtime/eval/debugger/cmd/cmd_out.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_EVAL_DEBUGGER_CMD_OUT_H__ -#define __HPHP_EVAL_DEBUGGER_CMD_OUT_H__ +#ifndef incl_HPHP_EVAL_DEBUGGER_CMD_OUT_H_ +#define incl_HPHP_EVAL_DEBUGGER_CMD_OUT_H_ #include @@ -33,4 +33,4 @@ public: /////////////////////////////////////////////////////////////////////////////// }} -#endif // __HPHP_EVAL_DEBUGGER_CMD_OUT_H__ +#endif // incl_HPHP_EVAL_DEBUGGER_CMD_OUT_H_ diff --git a/hphp/runtime/eval/debugger/cmd/cmd_print.h b/hphp/runtime/eval/debugger/cmd/cmd_print.h index f24688105..8d0a41a8f 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_print.h +++ b/hphp/runtime/eval/debugger/cmd/cmd_print.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_EVAL_DEBUGGER_CMD_PRINT_H__ -#define __HPHP_EVAL_DEBUGGER_CMD_PRINT_H__ +#ifndef incl_HPHP_EVAL_DEBUGGER_CMD_PRINT_H_ +#define incl_HPHP_EVAL_DEBUGGER_CMD_PRINT_H_ #include @@ -64,4 +64,4 @@ private: /////////////////////////////////////////////////////////////////////////////// }} -#endif // __HPHP_EVAL_DEBUGGER_CMD_PRINT_H__ +#endif // incl_HPHP_EVAL_DEBUGGER_CMD_PRINT_H_ diff --git a/hphp/runtime/eval/debugger/cmd/cmd_quit.h b/hphp/runtime/eval/debugger/cmd/cmd_quit.h index 9424b4d1c..660981ade 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_quit.h +++ b/hphp/runtime/eval/debugger/cmd/cmd_quit.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_EVAL_DEBUGGER_CMD_QUIT_H__ -#define __HPHP_EVAL_DEBUGGER_CMD_QUIT_H__ +#ifndef incl_HPHP_EVAL_DEBUGGER_CMD_QUIT_H_ +#define incl_HPHP_EVAL_DEBUGGER_CMD_QUIT_H_ #include @@ -34,4 +34,4 @@ public: /////////////////////////////////////////////////////////////////////////////// }} -#endif // __HPHP_EVAL_DEBUGGER_CMD_QUIT_H__ +#endif // incl_HPHP_EVAL_DEBUGGER_CMD_QUIT_H_ diff --git a/hphp/runtime/eval/debugger/cmd/cmd_run.h b/hphp/runtime/eval/debugger/cmd/cmd_run.h index 22feae83f..b4a4a5199 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_run.h +++ b/hphp/runtime/eval/debugger/cmd/cmd_run.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_EVAL_DEBUGGER_CMD_RUN_H__ -#define __HPHP_EVAL_DEBUGGER_CMD_RUN_H__ +#ifndef incl_HPHP_EVAL_DEBUGGER_CMD_RUN_H_ +#define incl_HPHP_EVAL_DEBUGGER_CMD_RUN_H_ #include @@ -44,4 +44,4 @@ private: /////////////////////////////////////////////////////////////////////////////// }} -#endif // __HPHP_EVAL_DEBUGGER_CMD_RUN_H__ +#endif // incl_HPHP_EVAL_DEBUGGER_CMD_RUN_H_ diff --git a/hphp/runtime/eval/debugger/cmd/cmd_shell.h b/hphp/runtime/eval/debugger/cmd/cmd_shell.h index 4bce51e4d..4348899d9 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_shell.h +++ b/hphp/runtime/eval/debugger/cmd/cmd_shell.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_EVAL_DEBUGGER_CMD_SHELL_H__ -#define __HPHP_EVAL_DEBUGGER_CMD_SHELL_H__ +#ifndef incl_HPHP_EVAL_DEBUGGER_CMD_SHELL_H_ +#define incl_HPHP_EVAL_DEBUGGER_CMD_SHELL_H_ #include @@ -44,4 +44,4 @@ private: /////////////////////////////////////////////////////////////////////////////// }} -#endif // __HPHP_EVAL_DEBUGGER_CMD_SHELL_H__ +#endif // incl_HPHP_EVAL_DEBUGGER_CMD_SHELL_H_ diff --git a/hphp/runtime/eval/debugger/cmd/cmd_signal.h b/hphp/runtime/eval/debugger/cmd/cmd_signal.h index 41611b6b3..1747adaf8 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_signal.h +++ b/hphp/runtime/eval/debugger/cmd/cmd_signal.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_EVAL_DEBUGGER_CMD_SIGNAL_H__ -#define __HPHP_EVAL_DEBUGGER_CMD_SIGNAL_H__ +#ifndef incl_HPHP_EVAL_DEBUGGER_CMD_SIGNAL_H_ +#define incl_HPHP_EVAL_DEBUGGER_CMD_SIGNAL_H_ #include @@ -49,4 +49,4 @@ private: /////////////////////////////////////////////////////////////////////////////// }} -#endif // __HPHP_EVAL_DEBUGGER_CMD_SIGNAL_H__ +#endif // incl_HPHP_EVAL_DEBUGGER_CMD_SIGNAL_H_ diff --git a/hphp/runtime/eval/debugger/cmd/cmd_step.h b/hphp/runtime/eval/debugger/cmd/cmd_step.h index cc491c682..bfff4d120 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_step.h +++ b/hphp/runtime/eval/debugger/cmd/cmd_step.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_EVAL_DEBUGGER_CMD_STEP_H__ -#define __HPHP_EVAL_DEBUGGER_CMD_STEP_H__ +#ifndef incl_HPHP_EVAL_DEBUGGER_CMD_STEP_H_ +#define incl_HPHP_EVAL_DEBUGGER_CMD_STEP_H_ #include @@ -33,4 +33,4 @@ public: /////////////////////////////////////////////////////////////////////////////// }} -#endif // __HPHP_EVAL_DEBUGGER_CMD_STEP_H__ +#endif // incl_HPHP_EVAL_DEBUGGER_CMD_STEP_H_ diff --git a/hphp/runtime/eval/debugger/cmd/cmd_thread.h b/hphp/runtime/eval/debugger/cmd/cmd_thread.h index c9cd62e20..e74488ad3 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_thread.h +++ b/hphp/runtime/eval/debugger/cmd/cmd_thread.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_EVAL_DEBUGGER_CMD_THREAD_H__ -#define __HPHP_EVAL_DEBUGGER_CMD_THREAD_H__ +#ifndef incl_HPHP_EVAL_DEBUGGER_CMD_THREAD_H_ +#define incl_HPHP_EVAL_DEBUGGER_CMD_THREAD_H_ #include #include @@ -50,4 +50,4 @@ private: /////////////////////////////////////////////////////////////////////////////// }} -#endif // __HPHP_EVAL_DEBUGGER_CMD_THREAD_H__ +#endif // incl_HPHP_EVAL_DEBUGGER_CMD_THREAD_H_ diff --git a/hphp/runtime/eval/debugger/cmd/cmd_up.h b/hphp/runtime/eval/debugger/cmd/cmd_up.h index 51b4648bc..764820f4e 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_up.h +++ b/hphp/runtime/eval/debugger/cmd/cmd_up.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_EVAL_DEBUGGER_CMD_UP_H__ -#define __HPHP_EVAL_DEBUGGER_CMD_UP_H__ +#ifndef incl_HPHP_EVAL_DEBUGGER_CMD_UP_H_ +#define incl_HPHP_EVAL_DEBUGGER_CMD_UP_H_ #include @@ -38,4 +38,4 @@ public: /////////////////////////////////////////////////////////////////////////////// }} -#endif // __HPHP_EVAL_DEBUGGER_CMD_UP_H__ +#endif // incl_HPHP_EVAL_DEBUGGER_CMD_UP_H_ diff --git a/hphp/runtime/eval/debugger/cmd/cmd_user.h b/hphp/runtime/eval/debugger/cmd/cmd_user.h index 395e79774..ba43eb7b9 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_user.h +++ b/hphp/runtime/eval/debugger/cmd/cmd_user.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_EVAL_DEBUGGER_CMD_USER_H__ -#define __HPHP_EVAL_DEBUGGER_CMD_USER_H__ +#ifndef incl_HPHP_EVAL_DEBUGGER_CMD_USER_H_ +#define incl_HPHP_EVAL_DEBUGGER_CMD_USER_H_ #include #include @@ -61,4 +61,4 @@ private: /////////////////////////////////////////////////////////////////////////////// }} -#endif // __HPHP_EVAL_DEBUGGER_CMD_USER_H__ +#endif // incl_HPHP_EVAL_DEBUGGER_CMD_USER_H_ diff --git a/hphp/runtime/eval/debugger/cmd/cmd_variable.h b/hphp/runtime/eval/debugger/cmd/cmd_variable.h index e21875827..c7c5ae042 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_variable.h +++ b/hphp/runtime/eval/debugger/cmd/cmd_variable.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_EVAL_DEBUGGER_CMD_VARIABLE_H__ -#define __HPHP_EVAL_DEBUGGER_CMD_VARIABLE_H__ +#ifndef incl_HPHP_EVAL_DEBUGGER_CMD_VARIABLE_H_ +#define incl_HPHP_EVAL_DEBUGGER_CMD_VARIABLE_H_ #include @@ -50,4 +50,4 @@ private: /////////////////////////////////////////////////////////////////////////////// }} -#endif // __HPHP_EVAL_DEBUGGER_CMD_VARIABLE_H__ +#endif // incl_HPHP_EVAL_DEBUGGER_CMD_VARIABLE_H_ diff --git a/hphp/runtime/eval/debugger/cmd/cmd_where.h b/hphp/runtime/eval/debugger/cmd/cmd_where.h index a1ce31934..b567dff28 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_where.h +++ b/hphp/runtime/eval/debugger/cmd/cmd_where.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_EVAL_DEBUGGER_CMD_WHERE_H__ -#define __HPHP_EVAL_DEBUGGER_CMD_WHERE_H__ +#ifndef incl_HPHP_EVAL_DEBUGGER_CMD_WHERE_H_ +#define incl_HPHP_EVAL_DEBUGGER_CMD_WHERE_H_ #include @@ -48,4 +48,4 @@ private: /////////////////////////////////////////////////////////////////////////////// }} -#endif // __HPHP_EVAL_DEBUGGER_CMD_WHERE_H__ +#endif // incl_HPHP_EVAL_DEBUGGER_CMD_WHERE_H_ diff --git a/hphp/runtime/eval/debugger/cmd/cmd_zend.h b/hphp/runtime/eval/debugger/cmd/cmd_zend.h index a0afdbeca..4d3294bc8 100644 --- a/hphp/runtime/eval/debugger/cmd/cmd_zend.h +++ b/hphp/runtime/eval/debugger/cmd/cmd_zend.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_EVAL_DEBUGGER_CMD_ZEND_H__ -#define __HPHP_EVAL_DEBUGGER_CMD_ZEND_H__ +#ifndef incl_HPHP_EVAL_DEBUGGER_CMD_ZEND_H_ +#define incl_HPHP_EVAL_DEBUGGER_CMD_ZEND_H_ #include @@ -34,4 +34,4 @@ public: /////////////////////////////////////////////////////////////////////////////// }} -#endif // __HPHP_EVAL_DEBUGGER_CMD_ZEND_H__ +#endif // incl_HPHP_EVAL_DEBUGGER_CMD_ZEND_H_ diff --git a/hphp/runtime/eval/debugger/debugger.h b/hphp/runtime/eval/debugger/debugger.h index e085773c9..5a3de30d4 100644 --- a/hphp/runtime/eval/debugger/debugger.h +++ b/hphp/runtime/eval/debugger/debugger.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_EVAL_DEBUGGER_H__ -#define __HPHP_EVAL_DEBUGGER_H__ +#ifndef incl_HPHP_EVAL_DEBUGGER_H_ +#define incl_HPHP_EVAL_DEBUGGER_H_ #include #include @@ -168,4 +168,4 @@ private: /////////////////////////////////////////////////////////////////////////////// }} -#endif // __HPHP_EVAL_DEBUGGER_H__ +#endif // incl_HPHP_EVAL_DEBUGGER_H_ diff --git a/hphp/runtime/eval/debugger/debugger_base.h b/hphp/runtime/eval/debugger/debugger_base.h index e9b82a476..22cabd946 100644 --- a/hphp/runtime/eval/debugger/debugger_base.h +++ b/hphp/runtime/eval/debugger/debugger_base.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_EVAL_DEBUGGER_BASE_H__ -#define __HPHP_EVAL_DEBUGGER_BASE_H__ +#ifndef incl_HPHP_EVAL_DEBUGGER_BASE_H_ +#define incl_HPHP_EVAL_DEBUGGER_BASE_H_ #include #include @@ -200,4 +200,4 @@ public: /////////////////////////////////////////////////////////////////////////////// }} -#endif // __HPHP_EVAL_DEBUGGER_BASE_H__ +#endif // incl_HPHP_EVAL_DEBUGGER_BASE_H_ diff --git a/hphp/runtime/eval/debugger/debugger_client.h b/hphp/runtime/eval/debugger/debugger_client.h index 582148cbb..ad630ab7f 100644 --- a/hphp/runtime/eval/debugger/debugger_client.h +++ b/hphp/runtime/eval/debugger/debugger_client.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_EVAL_DEBUGGER_CLIENT_H__ -#define __HPHP_EVAL_DEBUGGER_CLIENT_H__ +#ifndef incl_HPHP_EVAL_DEBUGGER_CLIENT_H_ +#define incl_HPHP_EVAL_DEBUGGER_CLIENT_H_ #include #include @@ -481,4 +481,4 @@ private: /////////////////////////////////////////////////////////////////////////////// }} -#endif // __HPHP_EVAL_DEBUGGER_CLIENT_H__ +#endif // incl_HPHP_EVAL_DEBUGGER_CLIENT_H_ diff --git a/hphp/runtime/eval/debugger/debugger_client_settings.h b/hphp/runtime/eval/debugger/debugger_client_settings.h index 71665ba21..031eb68f0 100644 --- a/hphp/runtime/eval/debugger/debugger_client_settings.h +++ b/hphp/runtime/eval/debugger/debugger_client_settings.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_EVAL_DEBUGGER_CLIENT_SETTINGS_H__ -#define __HPHP_EVAL_DEBUGGER_CLIENT_SETTINGS_H__ +#ifndef incl_HPHP_EVAL_DEBUGGER_CLIENT_SETTINGS_H_ +#define incl_HPHP_EVAL_DEBUGGER_CLIENT_SETTINGS_H_ #define HPHPD_CLIENT_SETTINGS \ HPHPD_CLIENT_SETTING(ApiModeSerialize, bool, false) \ @@ -55,4 +55,4 @@ HPHPD_CLIENT_SETTINGS /////////////////////////////////////////////////////////////////////////////// -#endif // __HPHP_EVAL_DEBUGGER_CLIENT_SETTINGS_H__ +#endif // incl_HPHP_EVAL_DEBUGGER_CLIENT_SETTINGS_H_ diff --git a/hphp/runtime/eval/debugger/debugger_command.h b/hphp/runtime/eval/debugger/debugger_command.h index 0bce7df69..20e640cae 100644 --- a/hphp/runtime/eval/debugger/debugger_command.h +++ b/hphp/runtime/eval/debugger/debugger_command.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_EVAL_DEBUGGER_COMMAND_H__ -#define __HPHP_EVAL_DEBUGGER_COMMAND_H__ +#ifndef incl_HPHP_EVAL_DEBUGGER_COMMAND_H_ +#define incl_HPHP_EVAL_DEBUGGER_COMMAND_H_ #include #include @@ -127,4 +127,4 @@ protected: /////////////////////////////////////////////////////////////////////////////// }} -#endif // __HPHP_EVAL_DEBUGGER_COMMAND_H__ +#endif // incl_HPHP_EVAL_DEBUGGER_COMMAND_H_ diff --git a/hphp/runtime/eval/debugger/debugger_proxy.h b/hphp/runtime/eval/debugger/debugger_proxy.h index c3fdac692..5a873bfeb 100644 --- a/hphp/runtime/eval/debugger/debugger_proxy.h +++ b/hphp/runtime/eval/debugger/debugger_proxy.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_EVAL_DEBUGGER_PROXY_H__ -#define __HPHP_EVAL_DEBUGGER_PROXY_H__ +#ifndef incl_HPHP_EVAL_DEBUGGER_PROXY_H_ +#define incl_HPHP_EVAL_DEBUGGER_PROXY_H_ #include #include @@ -167,4 +167,4 @@ private: /////////////////////////////////////////////////////////////////////////////// }} -#endif // __HPHP_EVAL_DEBUGGER_PROXY_H__ +#endif // incl_HPHP_EVAL_DEBUGGER_PROXY_H_ diff --git a/hphp/runtime/eval/debugger/debugger_server.h b/hphp/runtime/eval/debugger/debugger_server.h index dce637513..6d2f1a898 100644 --- a/hphp/runtime/eval/debugger/debugger_server.h +++ b/hphp/runtime/eval/debugger/debugger_server.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_EVAL_DEBUGGER_SERVER_H__ -#define __HPHP_EVAL_DEBUGGER_SERVER_H__ +#ifndef incl_HPHP_EVAL_DEBUGGER_SERVER_H_ +#define incl_HPHP_EVAL_DEBUGGER_SERVER_H_ #include #include @@ -55,4 +55,4 @@ private: /////////////////////////////////////////////////////////////////////////////// }} -#endif // __HPHP_EVAL_DEBUGGER_SERVER_H__ +#endif // incl_HPHP_EVAL_DEBUGGER_SERVER_H_ diff --git a/hphp/runtime/eval/debugger/debugger_thrift_buffer.h b/hphp/runtime/eval/debugger/debugger_thrift_buffer.h index d3697bb9c..0fe9c7ead 100644 --- a/hphp/runtime/eval/debugger/debugger_thrift_buffer.h +++ b/hphp/runtime/eval/debugger/debugger_thrift_buffer.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_DEBUGGER_THRIFT_BUFFER_H__ -#define __HPHP_DEBUGGER_THRIFT_BUFFER_H__ +#ifndef incl_HPHP_DEBUGGER_THRIFT_BUFFER_H_ +#define incl_HPHP_DEBUGGER_THRIFT_BUFFER_H_ #include #include @@ -80,4 +80,4 @@ public: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_DEBUGGER_THRIFT_BUFFER_H__ +#endif // incl_HPHP_DEBUGGER_THRIFT_BUFFER_H_ diff --git a/hphp/runtime/eval/debugger/dummy_sandbox.h b/hphp/runtime/eval/debugger/dummy_sandbox.h index 863769635..71b748b92 100644 --- a/hphp/runtime/eval/debugger/dummy_sandbox.h +++ b/hphp/runtime/eval/debugger/dummy_sandbox.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_EVAL_DUMMY_SANDBOX_H__ -#define __HPHP_EVAL_DUMMY_SANDBOX_H__ +#ifndef incl_HPHP_EVAL_DUMMY_SANDBOX_H_ +#define incl_HPHP_EVAL_DUMMY_SANDBOX_H_ #include #include @@ -58,4 +58,4 @@ private: /////////////////////////////////////////////////////////////////////////////// }} -#endif // __HPHP_EVAL_DUMMY_SANDBOX_H__ +#endif // incl_HPHP_EVAL_DUMMY_SANDBOX_H_ diff --git a/hphp/runtime/eval/debugger/inst_point.h b/hphp/runtime/eval/debugger/inst_point.h index 17ef70fae..32c53d13a 100644 --- a/hphp/runtime/eval/debugger/inst_point.h +++ b/hphp/runtime/eval/debugger/inst_point.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_EVAL_DEBUGGER_INST_POINT_H__ -#define __HPHP_EVAL_DEBUGGER_INST_POINT_H__ +#ifndef incl_HPHP_EVAL_DEBUGGER_INST_POINT_H_ +#define incl_HPHP_EVAL_DEBUGGER_INST_POINT_H_ #include #include @@ -65,4 +65,4 @@ public: /////////////////////////////////////////////////////////////////////////////// }} -#endif // __HPHP_EVAL_DEBUGGER_INST_POINT_H__ +#endif // incl_HPHP_EVAL_DEBUGGER_INST_POINT_H_ diff --git a/hphp/runtime/eval/runtime/file_repository.h b/hphp/runtime/eval/runtime/file_repository.h index 39c6502d4..b914fcdf0 100644 --- a/hphp/runtime/eval/runtime/file_repository.h +++ b/hphp/runtime/eval/runtime/file_repository.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EVAL_FILE_REPOSITORY_H__ -#define __EVAL_FILE_REPOSITORY_H__ +#ifndef incl_HPHP_EVAL_FILE_REPOSITORY_H_ +#define incl_HPHP_EVAL_FILE_REPOSITORY_H_ #include #include @@ -177,4 +177,4 @@ String resolveVmInclude(StringData* path, const char* currentDir, } } -#endif /* __EVAL_FILE_REPOSITORY_H__ */ +#endif /* incl_HPHP_EVAL_FILE_REPOSITORY_H_ */ diff --git a/hphp/runtime/ext/asio/asio_context.h b/hphp/runtime/ext/asio/asio_context.h index 60c442f57..f8574780e 100644 --- a/hphp/runtime/ext/asio/asio_context.h +++ b/hphp/runtime/ext/asio/asio_context.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_ASIO_CONTEXT_H__ -#define __EXT_ASIO_CONTEXT_H__ +#ifndef incl_HPHP_EXT_ASIO_CONTEXT_H_ +#define incl_HPHP_EXT_ASIO_CONTEXT_H_ #include #include @@ -70,4 +70,4 @@ class AsioContext { /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_ASIO_CONTEXT_H__ +#endif // incl_HPHP_EXT_ASIO_CONTEXT_H_ diff --git a/hphp/runtime/ext/asio/asio_session.h b/hphp/runtime/ext/asio/asio_session.h index ca243dc9c..5607ed42e 100644 --- a/hphp/runtime/ext/asio/asio_session.h +++ b/hphp/runtime/ext/asio/asio_session.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_ASIO_SESSION_H__ -#define __EXT_ASIO_SESSION_H__ +#ifndef incl_HPHP_EXT_ASIO_SESSION_H_ +#define incl_HPHP_EXT_ASIO_SESSION_H_ #include #include @@ -86,4 +86,4 @@ class AsioSession { /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_ASIO_SESSION_H__ +#endif // incl_HPHP_EXT_ASIO_SESSION_H_ diff --git a/hphp/runtime/ext/bcmath/bcmath.h b/hphp/runtime/ext/bcmath/bcmath.h index 048bd34e4..10f344aae 100644 --- a/hphp/runtime/ext/bcmath/bcmath.h +++ b/hphp/runtime/ext/bcmath/bcmath.h @@ -29,8 +29,8 @@ *************************************************************************/ -#ifndef _BCMATH_H_ -#define _BCMATH_H_ +#ifndef incl_HPHP_BCMATH_H_ +#define incl_HPHP_BCMATH_H_ #include "config.h" diff --git a/hphp/runtime/ext/ext_apache.h b/hphp/runtime/ext/ext_apache.h index db191f954..a76659f7d 100644 --- a/hphp/runtime/ext/ext_apache.h +++ b/hphp/runtime/ext/ext_apache.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_APACHE_H__ -#define __EXT_APACHE_H__ +#ifndef incl_HPHP_EXT_APACHE_H_ +#define incl_HPHP_EXT_APACHE_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -38,4 +38,4 @@ Variant f_apache_get_rewrite_rules(); /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_APACHE_H__ +#endif // incl_HPHP_EXT_APACHE_H_ diff --git a/hphp/runtime/ext/ext_apc.h b/hphp/runtime/ext/ext_apc.h index 8145fcc3f..c193ca7de 100644 --- a/hphp/runtime/ext/ext_apc.h +++ b/hphp/runtime/ext/ext_apc.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_APC_H__ -#define __EXT_APC_H__ +#ifndef incl_HPHP_EXT_APC_H_ +#define incl_HPHP_EXT_APC_H_ #include #include @@ -129,4 +129,4 @@ size_t get_const_map_size(); /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_APC_H__ +#endif // incl_HPHP_EXT_APC_H_ diff --git a/hphp/runtime/ext/ext_apd.h b/hphp/runtime/ext/ext_apd.h index 8780b0373..f37b0ab65 100644 --- a/hphp/runtime/ext/ext_apd.h +++ b/hphp/runtime/ext/ext_apd.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_APD_H__ -#define __EXT_APD_H__ +#ifndef incl_HPHP_EXT_APD_H_ +#define incl_HPHP_EXT_APD_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -38,4 +38,4 @@ bool f_apd_echo(CStrRef output); /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_APD_H__ +#endif // incl_HPHP_EXT_APD_H_ diff --git a/hphp/runtime/ext/ext_array.h b/hphp/runtime/ext/ext_array.h index 9d15ee2b6..74d686485 100644 --- a/hphp/runtime/ext/ext_array.h +++ b/hphp/runtime/ext/ext_array.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_ARRAY_H__ -#define __EXT_ARRAY_H__ +#ifndef incl_HPHP_EXT_ARRAY_H_ +#define incl_HPHP_EXT_ARRAY_H_ #include #include @@ -178,4 +178,4 @@ Variant f_i18n_loc_get_error_code(); /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_ARRAY_H__ +#endif // incl_HPHP_EXT_ARRAY_H_ diff --git a/hphp/runtime/ext/ext_asio.h b/hphp/runtime/ext/ext_asio.h index a62b359b7..ab5ede700 100644 --- a/hphp/runtime/ext/ext_asio.h +++ b/hphp/runtime/ext/ext_asio.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_ASIO_H__ -#define __EXT_ASIO_H__ +#ifndef incl_HPHP_EXT_ASIO_H_ +#define incl_HPHP_EXT_ASIO_H_ #include #include @@ -441,4 +441,4 @@ class c_RescheduleWaitHandle : public c_WaitableWaitHandle { /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_ASIO_H__ +#endif // incl_HPHP_EXT_ASIO_H_ diff --git a/hphp/runtime/ext/ext_bcmath.h b/hphp/runtime/ext/ext_bcmath.h index 149429609..befb6ccdd 100644 --- a/hphp/runtime/ext/ext_bcmath.h +++ b/hphp/runtime/ext/ext_bcmath.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_BCMATH_H__ -#define __EXT_BCMATH_H__ +#ifndef incl_HPHP_EXT_BCMATH_H_ +#define incl_HPHP_EXT_BCMATH_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -40,4 +40,4 @@ Variant f_bcsqrt(CStrRef operand, int64_t scale = -1); /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_BCMATH_H__ +#endif // incl_HPHP_EXT_BCMATH_H_ diff --git a/hphp/runtime/ext/ext_bzip2.h b/hphp/runtime/ext/ext_bzip2.h index 1c9539122..116abc2f6 100644 --- a/hphp/runtime/ext/ext_bzip2.h +++ b/hphp/runtime/ext/ext_bzip2.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_BZIP2_H__ -#define __EXT_BZIP2_H__ +#ifndef incl_HPHP_EXT_BZIP2_H_ +#define incl_HPHP_EXT_BZIP2_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -41,4 +41,4 @@ Variant f_bzdecompress(CStrRef source, int small = 0); /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_BZIP2_H__ +#endif // incl_HPHP_EXT_BZIP2_H_ diff --git a/hphp/runtime/ext/ext_class.h b/hphp/runtime/ext/ext_class.h index 4652303bd..f21d9095a 100644 --- a/hphp/runtime/ext/ext_class.h +++ b/hphp/runtime/ext/ext_class.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_CLASS_H__ -#define __EXT_CLASS_H__ +#ifndef incl_HPHP_EXT_CLASS_H_ +#define incl_HPHP_EXT_CLASS_H_ #include @@ -52,4 +52,4 @@ Variant f_call_user_method(int _argc, CStrRef method_name, VRefParam obj, CArrRe /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_CLASS_H__ +#endif // incl_HPHP_EXT_CLASS_H_ diff --git a/hphp/runtime/ext/ext_closure.h b/hphp/runtime/ext/ext_closure.h index 710f374ec..de0eaccd5 100644 --- a/hphp/runtime/ext/ext_closure.h +++ b/hphp/runtime/ext/ext_closure.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_CLOSURE_H__ -#define __EXT_CLOSURE_H__ +#ifndef incl_HPHP_EXT_CLOSURE_H_ +#define incl_HPHP_EXT_CLOSURE_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -84,4 +84,4 @@ class c_DummyClosure : public ExtObjectData { /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_CLOSURE_H__ +#endif // incl_HPHP_EXT_CLOSURE_H_ diff --git a/hphp/runtime/ext/ext_collections.h b/hphp/runtime/ext/ext_collections.h index ca2bfcb35..b14b117a6 100644 --- a/hphp/runtime/ext/ext_collections.h +++ b/hphp/runtime/ext/ext_collections.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_COLLECTION_H__ -#define __EXT_COLLECTION_H__ +#ifndef incl_HPHP_EXT_COLLECTION_H_ +#define incl_HPHP_EXT_COLLECTION_H_ #include #include @@ -1485,4 +1485,4 @@ private: } -#endif // __EXT_COLLECTION_H__ +#endif // incl_HPHP_EXT_COLLECTION_H_ diff --git a/hphp/runtime/ext/ext_continuation.h b/hphp/runtime/ext/ext_continuation.h index 7e447795d..281339ba3 100644 --- a/hphp/runtime/ext/ext_continuation.h +++ b/hphp/runtime/ext/ext_continuation.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_CONTINUATION_H__ -#define __EXT_CONTINUATION_H__ +#ifndef incl_HPHP_EXT_CONTINUATION_H_ +#define incl_HPHP_EXT_CONTINUATION_H_ #include @@ -159,4 +159,4 @@ class c_DummyContinuation : public ExtObjectData { /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_CONTINUATION_H__ +#endif // incl_HPHP_EXT_CONTINUATION_H_ diff --git a/hphp/runtime/ext/ext_ctype.h b/hphp/runtime/ext/ext_ctype.h index d937acd11..b996c5a43 100644 --- a/hphp/runtime/ext/ext_ctype.h +++ b/hphp/runtime/ext/ext_ctype.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_CTYPE_H__ -#define __EXT_CTYPE_H__ +#ifndef incl_HPHP_EXT_CTYPE_H_ +#define incl_HPHP_EXT_CTYPE_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -40,4 +40,4 @@ bool f_ctype_xdigit(CVarRef text); /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_CTYPE_H__ +#endif // incl_HPHP_EXT_CTYPE_H_ diff --git a/hphp/runtime/ext/ext_curl.h b/hphp/runtime/ext/ext_curl.h index a76e5cbb5..1b6186604 100644 --- a/hphp/runtime/ext/ext_curl.h +++ b/hphp/runtime/ext/ext_curl.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_CURL_H__ -#define __EXT_CURL_H__ +#ifndef incl_HPHP_EXT_CURL_H_ +#define incl_HPHP_EXT_CURL_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< #include @@ -62,4 +62,4 @@ extern const int64_t k_CURLOPT_CONNECTTIMEOUT_MS; /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_CURL_H__ +#endif // incl_HPHP_EXT_CURL_H_ diff --git a/hphp/runtime/ext/ext_datetime.h b/hphp/runtime/ext/ext_datetime.h index a180fea37..7e16215b0 100644 --- a/hphp/runtime/ext/ext_datetime.h +++ b/hphp/runtime/ext/ext_datetime.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_DATETIME_H__ -#define __EXT_DATETIME_H__ +#ifndef incl_HPHP_EXT_DATETIME_H_ +#define incl_HPHP_EXT_DATETIME_H_ #include #include @@ -290,4 +290,4 @@ Variant f_date_sunset(int64_t timestamp, int format = 0, /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_DATETIME_H__ +#endif // incl_HPHP_EXT_DATETIME_H_ diff --git a/hphp/runtime/ext/ext_debugger.h b/hphp/runtime/ext/ext_debugger.h index 386885f0f..34db520d0 100644 --- a/hphp/runtime/ext/ext_debugger.h +++ b/hphp/runtime/ext/ext_debugger.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_DEBUGGER_H__ -#define __EXT_DEBUGGER_H__ +#ifndef incl_HPHP_EXT_DEBUGGER_H_ +#define incl_HPHP_EXT_DEBUGGER_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -136,4 +136,4 @@ class c_DebuggerClient : public ExtObjectData, public Sweepable { /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_DEBUGGER_H__ +#endif // incl_HPHP_EXT_DEBUGGER_H_ diff --git a/hphp/runtime/ext/ext_domdocument.h b/hphp/runtime/ext/ext_domdocument.h index cca530cf2..372657254 100644 --- a/hphp/runtime/ext/ext_domdocument.h +++ b/hphp/runtime/ext/ext_domdocument.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_DOMDOCUMENT_H__ -#define __EXT_DOMDOCUMENT_H__ +#ifndef incl_HPHP_EXT_DOMDOCUMENT_H_ +#define incl_HPHP_EXT_DOMDOCUMENT_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -587,4 +587,4 @@ class c_DOMXPath : public ExtObjectDataFlags @@ -64,4 +64,4 @@ public: /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_DOMDOCUMENT_INCLUDES_H__ +#endif // incl_HPHP_EXT_DOMDOCUMENT_INCLUDES_H_ diff --git a/hphp/runtime/ext/ext_error.h b/hphp/runtime/ext/ext_error.h index 6cfb58a78..0895da59d 100644 --- a/hphp/runtime/ext/ext_error.h +++ b/hphp/runtime/ext/ext_error.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_ERROR_H__ -#define __EXT_ERROR_H__ +#ifndef incl_HPHP_EXT_ERROR_H_ +#define incl_HPHP_EXT_ERROR_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -45,4 +45,4 @@ bool f_user_error(CStrRef error_msg, int error_type = k_E_USER_NOTICE); /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_ERROR_H__ +#endif // incl_HPHP_EXT_ERROR_H_ diff --git a/hphp/runtime/ext/ext_fb.h b/hphp/runtime/ext/ext_fb.h index da2ae6df6..e411df52d 100644 --- a/hphp/runtime/ext/ext_fb.h +++ b/hphp/runtime/ext/ext_fb.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_FB_H__ -#define __EXT_FB_H__ +#ifndef incl_HPHP_EXT_FB_H_ +#define incl_HPHP_EXT_FB_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -98,4 +98,4 @@ Variant fb_compact_unserialize(const char* str, int len, /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_FB_H__ +#endif // incl_HPHP_EXT_FB_H_ diff --git a/hphp/runtime/ext/ext_file.h b/hphp/runtime/ext/ext_file.h index 3a52c056e..d280037c2 100644 --- a/hphp/runtime/ext/ext_file.h +++ b/hphp/runtime/ext/ext_file.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_FILE_H__ -#define __EXT_FILE_H__ +#ifndef incl_HPHP_EXT_FILE_H_ +#define incl_HPHP_EXT_FILE_H_ #include @@ -158,4 +158,4 @@ void f_closedir(CObjRef dir_handle); /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_FILE_H__ +#endif // incl_HPHP_EXT_FILE_H_ diff --git a/hphp/runtime/ext/ext_function.h b/hphp/runtime/ext/ext_function.h index 08ca50462..651647189 100644 --- a/hphp/runtime/ext/ext_function.h +++ b/hphp/runtime/ext/ext_function.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_FUNCTION_H__ -#define __EXT_FUNCTION_H__ +#ifndef incl_HPHP_EXT_FUNCTION_H_ +#define incl_HPHP_EXT_FUNCTION_H_ #include @@ -74,4 +74,4 @@ void f_unregister_tick_function(CVarRef function_name); /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_FUNCTION_H__ +#endif // incl_HPHP_EXT_FUNCTION_H_ diff --git a/hphp/runtime/ext/ext_hash.h b/hphp/runtime/ext/ext_hash.h index ab8ab1dbf..e208d6d3c 100644 --- a/hphp/runtime/ext/ext_hash.h +++ b/hphp/runtime/ext/ext_hash.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_HASH_H__ -#define __EXT_HASH_H__ +#ifndef incl_HPHP_EXT_HASH_H_ +#define incl_HPHP_EXT_HASH_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -42,4 +42,4 @@ int64_t f_hphp_murmurhash(CStrRef key, int len, int seed); /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_HASH_H__ +#endif // incl_HPHP_EXT_HASH_H_ diff --git a/hphp/runtime/ext/ext_iconv.h b/hphp/runtime/ext/ext_iconv.h index 1de0ed2a5..dcaebd392 100644 --- a/hphp/runtime/ext/ext_iconv.h +++ b/hphp/runtime/ext/ext_iconv.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_ICONV_H__ -#define __EXT_ICONV_H__ +#ifndef incl_HPHP_EXT_ICONV_H_ +#define incl_HPHP_EXT_ICONV_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -40,4 +40,4 @@ String f_ob_iconv_handler(CStrRef contents, int status); /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_ICONV_H__ +#endif // incl_HPHP_EXT_ICONV_H_ diff --git a/hphp/runtime/ext/ext_icu.h b/hphp/runtime/ext/ext_icu.h index 7e75be021..6ad5c544b 100644 --- a/hphp/runtime/ext/ext_icu.h +++ b/hphp/runtime/ext/ext_icu.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_ICU_H__ -#define __EXT_ICU_H__ +#ifndef incl_HPHP_EXT_ICU_H_ +#define incl_HPHP_EXT_ICU_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -44,4 +44,4 @@ extern const int64_t k_UREGEX_OFFSET_CAPTURE; /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_ICU_H__ +#endif // incl_HPHP_EXT_ICU_H_ diff --git a/hphp/runtime/ext/ext_icu_ucnv.h b/hphp/runtime/ext/ext_icu_ucnv.h index 3a28cd7fb..56de7af6c 100644 --- a/hphp/runtime/ext/ext_icu_ucnv.h +++ b/hphp/runtime/ext/ext_icu_ucnv.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_ICU_UCNV_H__ -#define __EXT_ICU_UCNV_H__ +#ifndef incl_HPHP_EXT_ICU_UCNV_H_ +#define incl_HPHP_EXT_ICU_UCNV_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -173,4 +173,4 @@ class c_UConverter : public ExtObjectData { /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_ICU_UCNV_H__ +#endif // incl_HPHP_EXT_ICU_UCNV_H_ diff --git a/hphp/runtime/ext/ext_icu_ucsdet.h b/hphp/runtime/ext/ext_icu_ucsdet.h index 624fe4cb2..ffbac2113 100644 --- a/hphp/runtime/ext/ext_icu_ucsdet.h +++ b/hphp/runtime/ext/ext_icu_ucsdet.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_ICU_UCSDET_H__ -#define __EXT_ICU_UCSDET_H__ +#ifndef incl_HPHP_EXT_ICU_UCSDET_H_ +#define incl_HPHP_EXT_ICU_UCSDET_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -85,4 +85,4 @@ class c_EncodingMatch : public ExtObjectData { /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_ICU_UCSDET_H__ +#endif // incl_HPHP_EXT_ICU_UCSDET_H_ diff --git a/hphp/runtime/ext/ext_image.h b/hphp/runtime/ext/ext_image.h index d25fe4840..1766b600b 100644 --- a/hphp/runtime/ext/ext_image.h +++ b/hphp/runtime/ext/ext_image.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_IMAGE_H__ -#define __EXT_IMAGE_H__ +#ifndef incl_HPHP_EXT_IMAGE_H_ +#define incl_HPHP_EXT_IMAGE_H_ #include #include @@ -160,4 +160,4 @@ Variant f_exif_thumbnail(CStrRef filename, VRefParam width = uninit_null(), VRef /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_IMAGE_H__ +#endif // incl_HPHP_EXT_IMAGE_H_ diff --git a/hphp/runtime/ext/ext_imagesprite.h b/hphp/runtime/ext/ext_imagesprite.h index f528882fc..0dcd5bebf 100644 --- a/hphp/runtime/ext/ext_imagesprite.h +++ b/hphp/runtime/ext/ext_imagesprite.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_IMAGESPRITE_H__ -#define __EXT_IMAGESPRITE_H__ +#ifndef incl_HPHP_EXT_IMAGESPRITE_H_ +#define incl_HPHP_EXT_IMAGESPRITE_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -73,4 +73,4 @@ class c_ImageSprite : public ExtObjectData, public Sweepable { /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_IMAGESPRITE_H__ +#endif // incl_HPHP_EXT_IMAGESPRITE_H_ diff --git a/hphp/runtime/ext/ext_imagesprite_include.h b/hphp/runtime/ext/ext_imagesprite_include.h index 347e79886..10c9caad1 100644 --- a/hphp/runtime/ext/ext_imagesprite_include.h +++ b/hphp/runtime/ext/ext_imagesprite_include.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_IMAGESPRITE_INCLUDE_H__ -#define __EXT_IMAGESPRITE_INCLUDE_H__ +#ifndef incl_HPHP_EXT_IMAGESPRITE_INCLUDE_H_ +#define incl_HPHP_EXT_IMAGESPRITE_INCLUDE_H_ #include #include @@ -194,4 +194,4 @@ class Block { } // ImageSprite } // HPHP -#endif // __EXT_IMAGESPRITE_INCLUDE_H__ +#endif // incl_HPHP_EXT_IMAGESPRITE_INCLUDE_H_ diff --git a/hphp/runtime/ext/ext_imap.h b/hphp/runtime/ext/ext_imap.h index 9862ea175..d9c525dfe 100644 --- a/hphp/runtime/ext/ext_imap.h +++ b/hphp/runtime/ext/ext_imap.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_IMAP_H__ -#define __EXT_IMAP_H__ +#ifndef incl_HPHP_EXT_IMAP_H_ +#define incl_HPHP_EXT_IMAP_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -97,4 +97,4 @@ Variant f_imap_utf8(CStrRef mime_encoded_text); /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_IMAP_H__ +#endif // incl_HPHP_EXT_IMAP_H_ diff --git a/hphp/runtime/ext/ext_intl.h b/hphp/runtime/ext/ext_intl.h index d0ebf1554..bfa6136b8 100644 --- a/hphp/runtime/ext/ext_intl.h +++ b/hphp/runtime/ext/ext_intl.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_INTL_H__ -#define __EXT_INTL_H__ +#ifndef incl_HPHP_EXT_INTL_H_ +#define incl_HPHP_EXT_INTL_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -157,4 +157,4 @@ class c_Normalizer : public ExtObjectData, public Sweepable { /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_INTL_H__ +#endif // incl_HPHP_EXT_INTL_H_ diff --git a/hphp/runtime/ext/ext_ipc.h b/hphp/runtime/ext/ext_ipc.h index dbe15f7a4..02a7dddd2 100644 --- a/hphp/runtime/ext/ext_ipc.h +++ b/hphp/runtime/ext/ext_ipc.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_IPC_H__ -#define __EXT_IPC_H__ +#ifndef incl_HPHP_EXT_IPC_H_ +#define incl_HPHP_EXT_IPC_H_ #include @@ -61,4 +61,4 @@ bool f_shm_remove_var(int64_t shm_identifier, int64_t variable_key); /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_IPC_H__ +#endif // incl_HPHP_EXT_IPC_H_ diff --git a/hphp/runtime/ext/ext_iterator.h b/hphp/runtime/ext/ext_iterator.h index f242cb52d..aed26ff3f 100644 --- a/hphp/runtime/ext/ext_iterator.h +++ b/hphp/runtime/ext/ext_iterator.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_ITERATOR_H__ -#define __EXT_ITERATOR_H__ +#ifndef incl_HPHP_EXT_ITERATOR_H_ +#define incl_HPHP_EXT_ITERATOR_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -157,4 +157,4 @@ class c_MutableArrayIterator : public ExtObjectData, public Sweepable { /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_ITERATOR_H__ +#endif // incl_HPHP_EXT_ITERATOR_H_ diff --git a/hphp/runtime/ext/ext_json.h b/hphp/runtime/ext/ext_json.h index b6a4dffe2..3c24fd75e 100644 --- a/hphp/runtime/ext/ext_json.h +++ b/hphp/runtime/ext/ext_json.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_JSON_H__ -#define __EXT_JSON_H__ +#ifndef incl_HPHP_EXT_JSON_H_ +#define incl_HPHP_EXT_JSON_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -42,4 +42,4 @@ extern const int64_t k_JSON_FB_UNLIMITED; /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_JSON_H__ +#endif // incl_HPHP_EXT_JSON_H_ diff --git a/hphp/runtime/ext/ext_ldap.h b/hphp/runtime/ext/ext_ldap.h index f7c846aa3..253e9c5c4 100644 --- a/hphp/runtime/ext/ext_ldap.h +++ b/hphp/runtime/ext/ext_ldap.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_LDAP_H__ -#define __EXT_LDAP_H__ +#ifndef incl_HPHP_EXT_LDAP_H_ +#define incl_HPHP_EXT_LDAP_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -69,4 +69,4 @@ Variant f_ldap_get_values(CObjRef link, CObjRef result_entry, CStrRef attribute) /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_LDAP_H__ +#endif // incl_HPHP_EXT_LDAP_H_ diff --git a/hphp/runtime/ext/ext_magick.h b/hphp/runtime/ext/ext_magick.h index a56724861..30484fd8c 100644 --- a/hphp/runtime/ext/ext_magick.h +++ b/hphp/runtime/ext/ext_magick.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_MAGICK_H__ -#define __EXT_MAGICK_H__ +#ifndef incl_HPHP_EXT_MAGICK_H_ +#define incl_HPHP_EXT_MAGICK_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -457,4 +457,4 @@ bool f_pixelsynciterator(CObjRef pxl_iter); /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_MAGICK_H__ +#endif // incl_HPHP_EXT_MAGICK_H_ diff --git a/hphp/runtime/ext/ext_mailparse.h b/hphp/runtime/ext/ext_mailparse.h index c30ff425e..ef23ac540 100644 --- a/hphp/runtime/ext/ext_mailparse.h +++ b/hphp/runtime/ext/ext_mailparse.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_MAILPARSE_H__ -#define __EXT_MAILPARSE_H__ +#ifndef incl_HPHP_EXT_MAILPARSE_H_ +#define incl_HPHP_EXT_MAILPARSE_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -45,4 +45,4 @@ Variant f_mailparse_determine_best_xfer_encoding(CObjRef fp); /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_MAILPARSE_H__ +#endif // incl_HPHP_EXT_MAILPARSE_H_ diff --git a/hphp/runtime/ext/ext_math.h b/hphp/runtime/ext/ext_math.h index 7c988a4a6..1b5f621fe 100644 --- a/hphp/runtime/ext/ext_math.h +++ b/hphp/runtime/ext/ext_math.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_MATH_H__ -#define __EXT_MATH_H__ +#ifndef incl_HPHP_EXT_MATH_H_ +#define incl_HPHP_EXT_MATH_H_ #include #include @@ -109,4 +109,4 @@ double f_lcg_value(); /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_MATH_H__ +#endif // incl_HPHP_EXT_MATH_H_ diff --git a/hphp/runtime/ext/ext_mb.h b/hphp/runtime/ext/ext_mb.h index a8c483af1..85da3e4f3 100644 --- a/hphp/runtime/ext/ext_mb.h +++ b/hphp/runtime/ext/ext_mb.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_MB_H__ -#define __EXT_MB_H__ +#ifndef incl_HPHP_EXT_MB_H_ +#define incl_HPHP_EXT_MB_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -84,4 +84,4 @@ Variant f_mb_substr(CStrRef str, int start, int length = 0x7FFFFFFF, CStrRef enc /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_MB_H__ +#endif // incl_HPHP_EXT_MB_H_ diff --git a/hphp/runtime/ext/ext_mcrypt.h b/hphp/runtime/ext/ext_mcrypt.h index aff18c989..6df73c296 100644 --- a/hphp/runtime/ext/ext_mcrypt.h +++ b/hphp/runtime/ext/ext_mcrypt.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_MCRYPT_H__ -#define __EXT_MCRYPT_H__ +#ifndef incl_HPHP_EXT_MCRYPT_H_ +#define incl_HPHP_EXT_MCRYPT_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -66,4 +66,4 @@ bool f_mcrypt_generic_end(CObjRef td); /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_MCRYPT_H__ +#endif // incl_HPHP_EXT_MCRYPT_H_ diff --git a/hphp/runtime/ext/ext_memcache.h b/hphp/runtime/ext/ext_memcache.h index 6e0bc2729..b0a7e324c 100644 --- a/hphp/runtime/ext/ext_memcache.h +++ b/hphp/runtime/ext/ext_memcache.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_MEMCACHE_H__ -#define __EXT_MEMCACHE_H__ +#ifndef incl_HPHP_EXT_MEMCACHE_H_ +#define incl_HPHP_EXT_MEMCACHE_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -90,4 +90,4 @@ class c_Memcache : public ExtObjectData, public Sweepable { /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_MEMCACHE_H__ +#endif // incl_HPHP_EXT_MEMCACHE_H_ diff --git a/hphp/runtime/ext/ext_memcached.h b/hphp/runtime/ext/ext_memcached.h index d2920c55a..2cf5886a6 100644 --- a/hphp/runtime/ext/ext_memcached.h +++ b/hphp/runtime/ext/ext_memcached.h @@ -16,8 +16,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_MEMCACHED_H__ -#define __EXT_MEMCACHED_H__ +#ifndef incl_HPHP_EXT_MEMCACHED_H_ +#define incl_HPHP_EXT_MEMCACHED_H_ #include #include @@ -169,4 +169,4 @@ class c_Memcached : public ExtObjectData, public Sweepable { /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_MEMCACHED_H__ +#endif // incl_HPHP_EXT_MEMCACHED_H_ diff --git a/hphp/runtime/ext/ext_misc.h b/hphp/runtime/ext/ext_misc.h index 779cff32d..57b247dfc 100644 --- a/hphp/runtime/ext/ext_misc.h +++ b/hphp/runtime/ext/ext_misc.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_MISC_H__ -#define __EXT_MISC_H__ +#ifndef incl_HPHP_EXT_MISC_H_ +#define incl_HPHP_EXT_MISC_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -60,4 +60,4 @@ extern const double k_NAN; /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_MISC_H__ +#endif // incl_HPHP_EXT_MISC_H_ diff --git a/hphp/runtime/ext/ext_mysql.h b/hphp/runtime/ext/ext_mysql.h index c80757567..d5d8cfbbc 100644 --- a/hphp/runtime/ext/ext_mysql.h +++ b/hphp/runtime/ext/ext_mysql.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_MYSQL_H__ -#define __EXT_MYSQL_H__ +#ifndef incl_HPHP_EXT_MYSQL_H_ +#define incl_HPHP_EXT_MYSQL_H_ #include #include @@ -375,4 +375,4 @@ extern const int64_t k_ASYNC_OP_FETCH_ROW; } -#endif // __EXT_MYSQL_H__ +#endif // incl_HPHP_EXT_MYSQL_H_ diff --git a/hphp/runtime/ext/ext_network.h b/hphp/runtime/ext/ext_network.h index 9407de319..5dd8e53c9 100644 --- a/hphp/runtime/ext/ext_network.h +++ b/hphp/runtime/ext/ext_network.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_NETWORK_H__ -#define __EXT_NETWORK_H__ +#ifndef incl_HPHP_EXT_NETWORK_H_ +#define incl_HPHP_EXT_NETWORK_H_ #include #include @@ -105,4 +105,4 @@ bool f_syslog(int priority, CStrRef message); /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_NETWORK_H__ +#endif // incl_HPHP_EXT_NETWORK_H_ diff --git a/hphp/runtime/ext/ext_openssl.h b/hphp/runtime/ext/ext_openssl.h index fe5966768..ff654daaa 100644 --- a/hphp/runtime/ext/ext_openssl.h +++ b/hphp/runtime/ext/ext_openssl.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_OPENSSL_H__ -#define __EXT_OPENSSL_H__ +#ifndef incl_HPHP_EXT_OPENSSL_H_ +#define incl_HPHP_EXT_OPENSSL_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -77,4 +77,4 @@ extern const int64_t k_OPENSSL_ZERO_PADDING; /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_OPENSSL_H__ +#endif // incl_HPHP_EXT_OPENSSL_H_ diff --git a/hphp/runtime/ext/ext_options.h b/hphp/runtime/ext/ext_options.h index c034979a7..3a2a9af74 100644 --- a/hphp/runtime/ext/ext_options.h +++ b/hphp/runtime/ext/ext_options.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_OPTIONS_H__ -#define __EXT_OPTIONS_H__ +#ifndef incl_HPHP_EXT_OPTIONS_H_ +#define incl_HPHP_EXT_OPTIONS_H_ #include #include @@ -85,4 +85,4 @@ String f_zend_version(); /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_OPTIONS_H__ +#endif // incl_HPHP_EXT_OPTIONS_H_ diff --git a/hphp/runtime/ext/ext_output.h b/hphp/runtime/ext/ext_output.h index 3eb8f96d0..2a5f2eee4 100644 --- a/hphp/runtime/ext/ext_output.h +++ b/hphp/runtime/ext/ext_output.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_OUTPUT_H__ -#define __EXT_OUTPUT_H__ +#ifndef incl_HPHP_EXT_OUTPUT_H_ +#define incl_HPHP_EXT_OUTPUT_H_ #include #include @@ -60,4 +60,4 @@ void f_hphp_clear_hardware_events(void); /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_OUTPUT_H__ +#endif // incl_HPHP_EXT_OUTPUT_H_ diff --git a/hphp/runtime/ext/ext_pdo.h b/hphp/runtime/ext/ext_pdo.h index 0f251dda8..74e639203 100644 --- a/hphp/runtime/ext/ext_pdo.h +++ b/hphp/runtime/ext/ext_pdo.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_PDO_H__ -#define __EXT_PDO_H__ +#ifndef incl_HPHP_EXT_PDO_H_ +#define incl_HPHP_EXT_PDO_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -191,4 +191,4 @@ class c_PDOStatement : public ExtObjectData, public Sweepable { /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_PDO_H__ +#endif // incl_HPHP_EXT_PDO_H_ diff --git a/hphp/runtime/ext/ext_posix.h b/hphp/runtime/ext/ext_posix.h index 343bea089..b223627d8 100644 --- a/hphp/runtime/ext/ext_posix.h +++ b/hphp/runtime/ext/ext_posix.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_POSIX_H__ -#define __EXT_POSIX_H__ +#ifndef incl_HPHP_EXT_POSIX_H_ +#define incl_HPHP_EXT_POSIX_H_ #include #include @@ -99,4 +99,4 @@ Variant f_posix_uname(); /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_POSIX_H__ +#endif // incl_HPHP_EXT_POSIX_H_ diff --git a/hphp/runtime/ext/ext_preg.h b/hphp/runtime/ext/ext_preg.h index 1efe6d157..4abb1f998 100644 --- a/hphp/runtime/ext/ext_preg.h +++ b/hphp/runtime/ext/ext_preg.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_PREG_H__ -#define __EXT_PREG_H__ +#ifndef incl_HPHP_EXT_PREG_H_ +#define incl_HPHP_EXT_PREG_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -62,4 +62,4 @@ String f_sql_regcase(CStrRef str); /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_PREG_H__ +#endif // incl_HPHP_EXT_PREG_H_ diff --git a/hphp/runtime/ext/ext_process.h b/hphp/runtime/ext/ext_process.h index 044806c6d..e4ca7705a 100644 --- a/hphp/runtime/ext/ext_process.h +++ b/hphp/runtime/ext/ext_process.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_PROCESS_H__ -#define __EXT_PROCESS_H__ +#ifndef incl_HPHP_EXT_PROCESS_H_ +#define incl_HPHP_EXT_PROCESS_H_ #include #include @@ -76,4 +76,4 @@ String f_escapeshellcmd(CStrRef command); /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_PROCESS_H__ +#endif // incl_HPHP_EXT_PROCESS_H_ diff --git a/hphp/runtime/ext/ext_reflection.h b/hphp/runtime/ext/ext_reflection.h index 52c5254c7..b0f5b547d 100644 --- a/hphp/runtime/ext/ext_reflection.h +++ b/hphp/runtime/ext/ext_reflection.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_REFLECTION_H__ -#define __EXT_REFLECTION_H__ +#ifndef incl_HPHP_EXT_REFLECTION_H_ +#define incl_HPHP_EXT_REFLECTION_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -46,4 +46,4 @@ bool f_hphp_scalar_typehints_enabled(); /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_REFLECTION_H__ +#endif // incl_HPHP_EXT_REFLECTION_H_ diff --git a/hphp/runtime/ext/ext_server.h b/hphp/runtime/ext/ext_server.h index 999be921d..aec076eea 100644 --- a/hphp/runtime/ext/ext_server.h +++ b/hphp/runtime/ext/ext_server.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_SERVER_H__ -#define __EXT_SERVER_H__ +#ifndef incl_HPHP_EXT_SERVER_H_ +#define incl_HPHP_EXT_SERVER_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -58,4 +58,4 @@ int64_t f_xbox_get_thread_time(); /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_SERVER_H__ +#endif // incl_HPHP_EXT_SERVER_H_ diff --git a/hphp/runtime/ext/ext_session.h b/hphp/runtime/ext/ext_session.h index d1c8f8c64..14d93548b 100644 --- a/hphp/runtime/ext/ext_session.h +++ b/hphp/runtime/ext/ext_session.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_SESSION_H__ -#define __EXT_SESSION_H__ +#ifndef incl_HPHP_EXT_SESSION_H_ +#define incl_HPHP_EXT_SESSION_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -49,4 +49,4 @@ bool f_session_is_registered(CStrRef varname); /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_SESSION_H__ +#endif // incl_HPHP_EXT_SESSION_H_ diff --git a/hphp/runtime/ext/ext_simplexml.h b/hphp/runtime/ext/ext_simplexml.h index 5b1e1c616..a87de9c56 100644 --- a/hphp/runtime/ext/ext_simplexml.h +++ b/hphp/runtime/ext/ext_simplexml.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_SIMPLEXML_H__ -#define __EXT_SIMPLEXML_H__ +#ifndef incl_HPHP_EXT_SIMPLEXML_H_ +#define incl_HPHP_EXT_SIMPLEXML_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -139,4 +139,4 @@ public: /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_SIMPLEXML_H__ +#endif // incl_HPHP_EXT_SIMPLEXML_H_ diff --git a/hphp/runtime/ext/ext_simplexml_include.h b/hphp/runtime/ext/ext_simplexml_include.h index cf1a3b8c3..044c43a12 100644 --- a/hphp/runtime/ext/ext_simplexml_include.h +++ b/hphp/runtime/ext/ext_simplexml_include.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_SIMPLEXML_INCLUDE_H__ -#define __EXT_SIMPLEXML_INCLUDE_H__ +#ifndef incl_HPHP_EXT_SIMPLEXML_INCLUDE_H_ +#define incl_HPHP_EXT_SIMPLEXML_INCLUDE_H_ #include #include @@ -29,4 +29,4 @@ #include #include -#endif // __EXT_SIMPLEXML_INCLUDE_H__ +#endif // incl_HPHP_EXT_SIMPLEXML_INCLUDE_H_ diff --git a/hphp/runtime/ext/ext_soap.h b/hphp/runtime/ext/ext_soap.h index 766c25640..2af4b774e 100644 --- a/hphp/runtime/ext/ext_soap.h +++ b/hphp/runtime/ext/ext_soap.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_SOAP_H__ -#define __EXT_SOAP_H__ +#ifndef incl_HPHP_EXT_SOAP_H_ +#define incl_HPHP_EXT_SOAP_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -198,4 +198,4 @@ class c_SoapHeader : public ExtObjectData { /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_SOAP_H__ +#endif // incl_HPHP_EXT_SOAP_H_ diff --git a/hphp/runtime/ext/ext_socket.h b/hphp/runtime/ext/ext_socket.h index d9370b6fe..a3d4574db 100644 --- a/hphp/runtime/ext/ext_socket.h +++ b/hphp/runtime/ext/ext_socket.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_SOCKET_H__ -#define __EXT_SOCKET_H__ +#ifndef incl_HPHP_EXT_SOCKET_H_ +#define incl_HPHP_EXT_SOCKET_H_ #include @@ -62,4 +62,4 @@ Variant f_getaddrinfo(CStrRef host, CStrRef port, int family = 0, /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_SOCKET_H__ +#endif // incl_HPHP_EXT_SOCKET_H_ diff --git a/hphp/runtime/ext/ext_spl.h b/hphp/runtime/ext/ext_spl.h index 926165c28..cc1bd9e82 100644 --- a/hphp/runtime/ext/ext_spl.h +++ b/hphp/runtime/ext/ext_spl.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_SPL_H__ -#define __EXT_SPL_H__ +#ifndef incl_HPHP_EXT_SPL_H_ +#define incl_HPHP_EXT_SPL_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -45,4 +45,4 @@ void f_spl_autoload(CStrRef class_name, CStrRef file_extensions = null_string); /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_SPL_H__ +#endif // incl_HPHP_EXT_SPL_H_ diff --git a/hphp/runtime/ext/ext_splfile.h b/hphp/runtime/ext/ext_splfile.h index 8d8b4bd15..3f8da192e 100644 --- a/hphp/runtime/ext/ext_splfile.h +++ b/hphp/runtime/ext/ext_splfile.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_SPLFILE_H__ -#define __EXT_SPLFILE_H__ +#ifndef incl_HPHP_EXT_SPLFILE_H_ +#define incl_HPHP_EXT_SPLFILE_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -119,4 +119,4 @@ void f_hphp_splfileobject_setmaxlinelen(CObjRef obj, int64_t max_len); /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_SPLFILE_H__ +#endif // incl_HPHP_EXT_SPLFILE_H_ diff --git a/hphp/runtime/ext/ext_sqlite3.h b/hphp/runtime/ext/ext_sqlite3.h index 918e6975f..7b40ab33b 100644 --- a/hphp/runtime/ext/ext_sqlite3.h +++ b/hphp/runtime/ext/ext_sqlite3.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_SQLITE3_H__ -#define __EXT_SQLITE3_H__ +#ifndef incl_HPHP_EXT_SQLITE3_H_ +#define incl_HPHP_EXT_SQLITE3_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -142,4 +142,4 @@ class c_SQLite3Result : public ExtObjectData { /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_SQLITE3_H__ +#endif // incl_HPHP_EXT_SQLITE3_H_ diff --git a/hphp/runtime/ext/ext_stream.h b/hphp/runtime/ext/ext_stream.h index 9721b627c..d4a87248b 100644 --- a/hphp/runtime/ext/ext_stream.h +++ b/hphp/runtime/ext/ext_stream.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_STREAM_H__ -#define __EXT_STREAM_H__ +#ifndef incl_HPHP_EXT_STREAM_H_ +#define incl_HPHP_EXT_STREAM_H_ #include #include @@ -147,4 +147,4 @@ bool f_stream_socket_shutdown(CObjRef stream, int how); /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_STREAM_H__ +#endif // incl_HPHP_EXT_STREAM_H_ diff --git a/hphp/runtime/ext/ext_thread.h b/hphp/runtime/ext/ext_thread.h index b6eb3e7f7..393388b6c 100644 --- a/hphp/runtime/ext/ext_thread.h +++ b/hphp/runtime/ext/ext_thread.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_THREAD_H__ -#define __EXT_THREAD_H__ +#ifndef incl_HPHP_EXT_THREAD_H_ +#define incl_HPHP_EXT_THREAD_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -36,4 +36,4 @@ int32_t f_hphp_gettid(); /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_THREAD_H__ +#endif // incl_HPHP_EXT_THREAD_H_ diff --git a/hphp/runtime/ext/ext_thrift.h b/hphp/runtime/ext/ext_thrift.h index c92c603ed..84674fd98 100644 --- a/hphp/runtime/ext/ext_thrift.h +++ b/hphp/runtime/ext/ext_thrift.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_THRIFT_H__ -#define __EXT_THRIFT_H__ +#ifndef incl_HPHP_EXT_THRIFT_H_ +#define incl_HPHP_EXT_THRIFT_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -50,4 +50,4 @@ Variant f_thrift_protocol_read_compact(CObjRef transportobj, /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_THRIFT_H__ +#endif // incl_HPHP_EXT_THRIFT_H_ diff --git a/hphp/runtime/ext/ext_url.h b/hphp/runtime/ext/ext_url.h index 6ca7170fd..d46bd475d 100644 --- a/hphp/runtime/ext/ext_url.h +++ b/hphp/runtime/ext/ext_url.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_URL_H__ -#define __EXT_URL_H__ +#ifndef incl_HPHP_EXT_URL_H_ +#define incl_HPHP_EXT_URL_H_ #include @@ -45,4 +45,4 @@ String f_urlencode(CStrRef str); /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_URL_H__ +#endif // incl_HPHP_EXT_URL_H_ diff --git a/hphp/runtime/ext/ext_variable.h b/hphp/runtime/ext/ext_variable.h index 8ce6ce595..dab00340f 100644 --- a/hphp/runtime/ext/ext_variable.h +++ b/hphp/runtime/ext/ext_variable.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_VARIABLE_H__ -#define __HPHP_VARIABLE_H__ +#ifndef incl_HPHP_VARIABLE_H_ +#define incl_HPHP_VARIABLE_H_ #include @@ -86,4 +86,4 @@ int64_t f_extract(CArrRef var_array, int extract_type = EXTR_OVERWRITE, /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_VARIABLE_H__ +#endif // incl_HPHP_VARIABLE_H_ diff --git a/hphp/runtime/ext/ext_xml.h b/hphp/runtime/ext/ext_xml.h index 01c9d9225..fe9236cbf 100644 --- a/hphp/runtime/ext/ext_xml.h +++ b/hphp/runtime/ext/ext_xml.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_XML_H__ -#define __EXT_XML_H__ +#ifndef incl_HPHP_EXT_XML_H_ +#define incl_HPHP_EXT_XML_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -53,4 +53,4 @@ String f_utf8_encode(CStrRef data); /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_XML_H__ +#endif // incl_HPHP_EXT_XML_H_ diff --git a/hphp/runtime/ext/ext_xmlreader.h b/hphp/runtime/ext/ext_xmlreader.h index 9b3c9e903..b172b2c87 100644 --- a/hphp/runtime/ext/ext_xmlreader.h +++ b/hphp/runtime/ext/ext_xmlreader.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_XMLREADER_H__ -#define __EXT_XMLREADER_H__ +#ifndef incl_HPHP_EXT_XMLREADER_H_ +#define incl_HPHP_EXT_XMLREADER_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -113,4 +113,4 @@ class c_XMLReader : public ExtObjectDataFlags, public Sweepa /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_XMLREADER_H__ +#endif // incl_HPHP_EXT_XMLREADER_H_ diff --git a/hphp/runtime/ext/ext_xmlwriter.h b/hphp/runtime/ext/ext_xmlwriter.h index 19d871929..05157e161 100644 --- a/hphp/runtime/ext/ext_xmlwriter.h +++ b/hphp/runtime/ext/ext_xmlwriter.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_XMLWRITER_H__ -#define __EXT_XMLWRITER_H__ +#ifndef incl_HPHP_EXT_XMLWRITER_H_ +#define incl_HPHP_EXT_XMLWRITER_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -139,4 +139,4 @@ class c_XMLWriter : public ExtObjectData, public Sweepable { /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_XMLWRITER_H__ +#endif // incl_HPHP_EXT_XMLWRITER_H_ diff --git a/hphp/runtime/ext/ext_zlib.h b/hphp/runtime/ext/ext_zlib.h index a607a2d3c..3f43f8970 100644 --- a/hphp/runtime/ext/ext_zlib.h +++ b/hphp/runtime/ext/ext_zlib.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_ZLIB_H__ -#define __EXT_ZLIB_H__ +#ifndef incl_HPHP_EXT_ZLIB_H_ +#define incl_HPHP_EXT_ZLIB_H_ #include #include @@ -67,4 +67,4 @@ Variant f_gzwrite(CObjRef zp, CStrRef str, int64_t length = 0); /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_ZLIB_H__ +#endif // incl_HPHP_EXT_ZLIB_H_ diff --git a/hphp/runtime/ext/extension.h b/hphp/runtime/ext/extension.h index 34d2a50c4..adcc41360 100644 --- a/hphp/runtime/ext/extension.h +++ b/hphp/runtime/ext/extension.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXTENSION_H__ -#define __EXTENSION_H__ +#ifndef incl_HPHP_EXTENSION_H_ +#define incl_HPHP_EXTENSION_H_ #include #include @@ -86,4 +86,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXTENSION_H__ +#endif // incl_HPHP_EXTENSION_H_ diff --git a/hphp/runtime/ext/hash/hash_adler32.h b/hphp/runtime/ext/hash/hash_adler32.h index 30a0dcd2b..30df2ef36 100644 --- a/hphp/runtime/ext/hash/hash_adler32.h +++ b/hphp/runtime/ext/hash/hash_adler32.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_HASH_ADLER32_H__ -#define __EXT_HASH_ADLER32_H__ +#ifndef incl_HPHP_EXT_HASH_ADLER32_H_ +#define incl_HPHP_EXT_HASH_ADLER32_H_ #include @@ -36,4 +36,4 @@ public: /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_HASH_ADLER32_H__ +#endif // incl_HPHP_EXT_HASH_ADLER32_H_ diff --git a/hphp/runtime/ext/hash/hash_crc32.h b/hphp/runtime/ext/hash/hash_crc32.h index 8a99b7c0b..955549459 100644 --- a/hphp/runtime/ext/hash/hash_crc32.h +++ b/hphp/runtime/ext/hash/hash_crc32.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_HASH_CRC32_H__ -#define __EXT_HASH_CRC32_H__ +#ifndef incl_HPHP_EXT_HASH_CRC32_H_ +#define incl_HPHP_EXT_HASH_CRC32_H_ #include @@ -39,4 +39,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_HASH_CRC32_H__ +#endif // incl_HPHP_EXT_HASH_CRC32_H_ diff --git a/hphp/runtime/ext/hash/hash_engine.h b/hphp/runtime/ext/hash/hash_engine.h index 335e67c24..c6b7b041e 100644 --- a/hphp/runtime/ext/hash/hash_engine.h +++ b/hphp/runtime/ext/hash/hash_engine.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_HASH_ENGINE_H__ -#define __EXT_HASH_ENGINE_H__ +#ifndef incl_HPHP_EXT_HASH_ENGINE_H_ +#define incl_HPHP_EXT_HASH_ENGINE_H_ #include @@ -48,4 +48,4 @@ typedef std::map HashEngineMap; /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_HASH_ENGINE_H__ +#endif // incl_HPHP_EXT_HASH_ENGINE_H_ diff --git a/hphp/runtime/ext/hash/hash_furc.h b/hphp/runtime/ext/hash/hash_furc.h index a75b63ff5..dc19df81c 100644 --- a/hphp/runtime/ext/hash/hash_furc.h +++ b/hphp/runtime/ext/hash/hash_furc.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_HASH_FURC_H__ -#define __EXT_HASH_FURC_H__ +#ifndef incl_HPHP_EXT_HASH_FURC_H_ +#define incl_HPHP_EXT_HASH_FURC_H_ #include @@ -28,6 +28,6 @@ uint32_t furc_hash_internal(const char* const key, const size_t len, const uint3 /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_HASH_FURC_H__ +#endif // incl_HPHP_EXT_HASH_FURC_H_ diff --git a/hphp/runtime/ext/hash/hash_gost.h b/hphp/runtime/ext/hash/hash_gost.h index 41da82dbb..ea4792ce9 100644 --- a/hphp/runtime/ext/hash/hash_gost.h +++ b/hphp/runtime/ext/hash/hash_gost.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_HASH_GOST_H__ -#define __EXT_HASH_GOST_H__ +#ifndef incl_HPHP_EXT_HASH_GOST_H_ +#define incl_HPHP_EXT_HASH_GOST_H_ #include @@ -36,4 +36,4 @@ public: /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_HASH_GOST_H__ +#endif // incl_HPHP_EXT_HASH_GOST_H_ diff --git a/hphp/runtime/ext/hash/hash_haval.h b/hphp/runtime/ext/hash/hash_haval.h index 9ec1ca6c7..b0ba71daa 100644 --- a/hphp/runtime/ext/hash/hash_haval.h +++ b/hphp/runtime/ext/hash/hash_haval.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_HASH_HAVAL_H__ -#define __EXT_HASH_HAVAL_H__ +#ifndef incl_HPHP_EXT_HASH_HAVAL_H_ +#define incl_HPHP_EXT_HASH_HAVAL_H_ #include @@ -40,4 +40,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_HASH_HAVAL_H__ +#endif // incl_HPHP_EXT_HASH_HAVAL_H_ diff --git a/hphp/runtime/ext/hash/hash_md.h b/hphp/runtime/ext/hash/hash_md.h index d2cd8cef9..a456782a2 100644 --- a/hphp/runtime/ext/hash/hash_md.h +++ b/hphp/runtime/ext/hash/hash_md.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_HASH_MD_H__ -#define __EXT_HASH_MD_H__ +#ifndef incl_HPHP_EXT_HASH_MD_H_ +#define incl_HPHP_EXT_HASH_MD_H_ #include @@ -56,4 +56,4 @@ public: /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_HASH_MD_H__ +#endif // incl_HPHP_EXT_HASH_MD_H_ diff --git a/hphp/runtime/ext/hash/hash_murmur.h b/hphp/runtime/ext/hash/hash_murmur.h index 4489a4db0..13103e749 100644 --- a/hphp/runtime/ext/hash/hash_murmur.h +++ b/hphp/runtime/ext/hash/hash_murmur.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_HASH_MURMUR_H__ -#define __EXT_HASH_MURMUR_H__ +#ifndef incl_HPHP_EXT_HASH_MURMUR_H_ +#define incl_HPHP_EXT_HASH_MURMUR_H_ #include @@ -35,6 +35,6 @@ static const int SEED = 4193360111ul; /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_HASH_MURMUR_H__ +#endif // incl_HPHP_EXT_HASH_MURMUR_H_ diff --git a/hphp/runtime/ext/hash/hash_ripemd.h b/hphp/runtime/ext/hash/hash_ripemd.h index d63555854..3806134ae 100644 --- a/hphp/runtime/ext/hash/hash_ripemd.h +++ b/hphp/runtime/ext/hash/hash_ripemd.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_HASH_RIPEMD_H__ -#define __EXT_HASH_RIPEMD_H__ +#ifndef incl_HPHP_EXT_HASH_RIPEMD_H_ +#define incl_HPHP_EXT_HASH_RIPEMD_H_ #include @@ -66,4 +66,4 @@ public: /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_HASH_RIPEMD_H__ +#endif // incl_HPHP_EXT_HASH_RIPEMD_H_ diff --git a/hphp/runtime/ext/hash/hash_salsa.h b/hphp/runtime/ext/hash/hash_salsa.h index 36df1d8dd..9ceb9369a 100644 --- a/hphp/runtime/ext/hash/hash_salsa.h +++ b/hphp/runtime/ext/hash/hash_salsa.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_HASH_SALSA_H__ -#define __EXT_HASH_SALSA_H__ +#ifndef incl_HPHP_EXT_HASH_SALSA_H_ +#define incl_HPHP_EXT_HASH_SALSA_H_ #include @@ -39,4 +39,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_HASH_SALSA_H__ +#endif // incl_HPHP_EXT_HASH_SALSA_H_ diff --git a/hphp/runtime/ext/hash/hash_sha.h b/hphp/runtime/ext/hash/hash_sha.h index c6ac2a1fe..8cf7a7d77 100644 --- a/hphp/runtime/ext/hash/hash_sha.h +++ b/hphp/runtime/ext/hash/hash_sha.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_HASH_SHA_H__ -#define __EXT_HASH_SHA_H__ +#ifndef incl_HPHP_EXT_HASH_SHA_H_ +#define incl_HPHP_EXT_HASH_SHA_H_ #include @@ -66,4 +66,4 @@ public: /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_HASH_SHA_H__ +#endif // incl_HPHP_EXT_HASH_SHA_H_ diff --git a/hphp/runtime/ext/hash/hash_snefru.h b/hphp/runtime/ext/hash/hash_snefru.h index 3df73a85e..bb7287045 100644 --- a/hphp/runtime/ext/hash/hash_snefru.h +++ b/hphp/runtime/ext/hash/hash_snefru.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_HASH_SNEFRU_H__ -#define __EXT_HASH_SNEFRU_H__ +#ifndef incl_HPHP_EXT_HASH_SNEFRU_H_ +#define incl_HPHP_EXT_HASH_SNEFRU_H_ #include @@ -36,4 +36,4 @@ public: /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_HASH_SNEFRU_H__ +#endif // incl_HPHP_EXT_HASH_SNEFRU_H_ diff --git a/hphp/runtime/ext/hash/hash_tiger.h b/hphp/runtime/ext/hash/hash_tiger.h index b6757c855..96a39d2df 100644 --- a/hphp/runtime/ext/hash/hash_tiger.h +++ b/hphp/runtime/ext/hash/hash_tiger.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_HASH_TIGER_H__ -#define __EXT_HASH_TIGER_H__ +#ifndef incl_HPHP_EXT_HASH_TIGER_H_ +#define incl_HPHP_EXT_HASH_TIGER_H_ #include @@ -40,4 +40,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_HASH_TIGER_H__ +#endif // incl_HPHP_EXT_HASH_TIGER_H_ diff --git a/hphp/runtime/ext/hash/hash_whirlpool.h b/hphp/runtime/ext/hash/hash_whirlpool.h index e38a35766..a255d569d 100644 --- a/hphp/runtime/ext/hash/hash_whirlpool.h +++ b/hphp/runtime/ext/hash/hash_whirlpool.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXT_HASH_WHIRLPOOL_H__ -#define __EXT_HASH_WHIRLPOOL_H__ +#ifndef incl_HPHP_EXT_HASH_WHIRLPOOL_H_ +#define incl_HPHP_EXT_HASH_WHIRLPOOL_H_ #include @@ -36,4 +36,4 @@ public: /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXT_HASH_WHIRLPOOL_H__ +#endif // incl_HPHP_EXT_HASH_WHIRLPOOL_H_ diff --git a/hphp/runtime/ext/icu/ICUMatcher.h b/hphp/runtime/ext/icu/ICUMatcher.h index c9c3759a8..ef2f165ee 100644 --- a/hphp/runtime/ext/icu/ICUMatcher.h +++ b/hphp/runtime/ext/icu/ICUMatcher.h @@ -14,8 +14,8 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#ifndef __ICU_MATCHER_H__ -#define __ICU_MATCHER_H__ +#ifndef incl_HPHP_ICU_MATCHER_H_ +#define incl_HPHP_ICU_MATCHER_H_ #include #include @@ -44,4 +44,4 @@ class ICUMatcher { } -#endif // __ICU_MATCHER_H__ +#endif // incl_HPHP_ICU_MATCHER_H_ diff --git a/hphp/runtime/ext/icu/ICUTransliterator.h b/hphp/runtime/ext/icu/ICUTransliterator.h index 18e622c24..82807292b 100644 --- a/hphp/runtime/ext/icu/ICUTransliterator.h +++ b/hphp/runtime/ext/icu/ICUTransliterator.h @@ -14,8 +14,8 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#ifndef __ICU__TRANSLITERATOR_H__ -#define __ICU__TRANSLITERATOR_H__ +#ifndef incl_HPHP_ICU_TRANSLITERATOR_H_ +#define incl_HPHP_ICU_TRANSLITERATOR_H_ #include #include @@ -42,4 +42,4 @@ class ICUTransliterator { } -#endif // __ICU__TRANSLITERATOR_H__ +#endif // incl_HPHP_ICU_TRANSLITERATOR_H_ diff --git a/hphp/runtime/ext/icu/LifeEventTokenizer.h b/hphp/runtime/ext/icu/LifeEventTokenizer.h index ae2796f93..0a6830684 100644 --- a/hphp/runtime/ext/icu/LifeEventTokenizer.h +++ b/hphp/runtime/ext/icu/LifeEventTokenizer.h @@ -14,8 +14,8 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#ifndef __ICU_LIFE_EVENT_TOKENIZER_H__ -#define __ICU_LIFE_EVENT_TOKENIZER_H__ +#ifndef incl_HPHP_ICU_LIFE_EVENT_TOKENIZER_H_ +#define incl_HPHP_ICU_LIFE_EVENT_TOKENIZER_H_ #include #include @@ -66,4 +66,4 @@ void tokenizeString( } -#endif // __ICU_LIFE_EVENT_TOKENIZER_H__ +#endif // incl_HPHP_ICU_LIFE_EVENT_TOKENIZER_H_ diff --git a/hphp/runtime/ext/mailparse/mime.h b/hphp/runtime/ext/mailparse/mime.h index 9b6951089..727978677 100644 --- a/hphp/runtime/ext/mailparse/mime.h +++ b/hphp/runtime/ext/mailparse/mime.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __PHP_MAILPARSE_MIME_H__ -#define __PHP_MAILPARSE_MIME_H__ +#ifndef incl_HPHP_PHP_MAILPARSE_MIME_H_ +#define incl_HPHP_PHP_MAILPARSE_MIME_H_ #include #include @@ -156,4 +156,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __PHP_MAILPARSE_MIME_H__ +#endif // incl_HPHP_PHP_MAILPARSE_MIME_H_ diff --git a/hphp/runtime/ext/mysql_stats.h b/hphp/runtime/ext/mysql_stats.h index 8d4612f0d..a23058957 100644 --- a/hphp/runtime/ext/mysql_stats.h +++ b/hphp/runtime/ext/mysql_stats.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_MYSQL_STATS_H__ -#define __HPHP_MYSQL_STATS_H__ +#ifndef incl_HPHP_MYSQLSTATS_H_ +#define incl_HPHP_MYSQLSTATS_H_ #include #include @@ -87,4 +87,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_MYSQL_STATS_H__ +#endif // incl_HPHP_MYSQLSTATS_H_ diff --git a/hphp/runtime/ext/pdo_driver.h b/hphp/runtime/ext/pdo_driver.h index ad04e055e..42fd4563a 100644 --- a/hphp/runtime/ext/pdo_driver.h +++ b/hphp/runtime/ext/pdo_driver.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __PDO_DRIVER_H__ -#define __PDO_DRIVER_H__ +#ifndef incl_HPHP_PDO_DRIVER_H_ +#define incl_HPHP_PDO_DRIVER_H_ #include @@ -612,4 +612,4 @@ void throw_pdo_exception(CVarRef code, CVarRef info, const char *fmt, ...); /////////////////////////////////////////////////////////////////////////////// } -#endif // __PDO_DRIVER_H__ +#endif // incl_HPHP_PDO_DRIVER_H_ diff --git a/hphp/runtime/ext/pdo_mysql.h b/hphp/runtime/ext/pdo_mysql.h index 04ded9a2c..dfddee6a0 100644 --- a/hphp/runtime/ext/pdo_mysql.h +++ b/hphp/runtime/ext/pdo_mysql.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __PDO_MYSQL_H__ -#define __PDO_MYSQL_H__ +#ifndef incl_HPHP_PDO_MYSQL_H_ +#define incl_HPHP_PDO_MYSQL_H_ #include @@ -48,4 +48,4 @@ public: /////////////////////////////////////////////////////////////////////////////// } -#endif // __PDO_MYSQL_H__ +#endif // incl_HPHP_PDO_MYSQL_H_ diff --git a/hphp/runtime/ext/pdo_sqlite.h b/hphp/runtime/ext/pdo_sqlite.h index c9a3ce978..096b82769 100644 --- a/hphp/runtime/ext/pdo_sqlite.h +++ b/hphp/runtime/ext/pdo_sqlite.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __PDO_SQLITE_H__ -#define __PDO_SQLITE_H__ +#ifndef incl_HPHP_PDO_SQLITE_H_ +#define incl_HPHP_PDO_SQLITE_H_ #include @@ -33,4 +33,4 @@ public: /////////////////////////////////////////////////////////////////////////////// } -#endif // __PDO_SQLITE_H__ +#endif // incl_HPHP_PDO_SQLITE_H_ diff --git a/hphp/runtime/ext/thrift/transport.h b/hphp/runtime/ext/thrift/transport.h index 09a93ae57..085c913dd 100644 --- a/hphp/runtime/ext/thrift/transport.h +++ b/hphp/runtime/ext/thrift/transport.h @@ -15,8 +15,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __THRIFT_TRANSPORT_H__ -#define __THRIFT_TRANSPORT_H__ +#ifndef incl_HPHP_THRIFT_TRANSPORT_H_ +#define incl_HPHP_THRIFT_TRANSPORT_H_ #include #include diff --git a/hphp/runtime/ext_hhvm/ext_hhvm.h b/hphp/runtime/ext_hhvm/ext_hhvm.h index dd2a9b2c1..ea644d11a 100644 --- a/hphp/runtime/ext_hhvm/ext_hhvm.h +++ b/hphp/runtime/ext_hhvm/ext_hhvm.h @@ -16,8 +16,8 @@ #include -#ifndef __HPHP_EXT_HHBC_H__ -#define __HPHP_EXT_HHBC_H__ +#ifndef incl_HPHP_EXT_HHBC_H_ +#define incl_HPHP_EXT_HHBC_H_ namespace HPHP { /////////////////////////////////////////////////////////////////////////////// @@ -54,5 +54,5 @@ extern const HhbcExtClassInfo hhbc_ext_classes[]; /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_EXT_HHBC_H__ +#endif // incl_HPHP_EXT_HHBC_H_ diff --git a/hphp/runtime/vm/as.h b/hphp/runtime/vm/as.h index b211d684a..38fbadc25 100644 --- a/hphp/runtime/vm/as.h +++ b/hphp/runtime/vm/as.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef incl_HHVM_AS_H_ -#define incl_HHVM_AS_H_ +#ifndef incl_HPHP_HHVM_AS_H_ +#define incl_HPHP_HHVM_AS_H_ #include diff --git a/hphp/runtime/vm/backup_gc.h b/hphp/runtime/vm/backup_gc.h index d5e0d211a..44300ba6c 100644 --- a/hphp/runtime/vm/backup_gc.h +++ b/hphp/runtime/vm/backup_gc.h @@ -13,8 +13,8 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#ifndef incl_VM_BACKUP_GC_H_ -#define incl_VM_BACKUP_GC_H_ +#ifndef incl_HPHP_VM_BACKUP_GC_H_ +#define incl_HPHP_VM_BACKUP_GC_H_ #include diff --git a/hphp/runtime/vm/blob_helper.h b/hphp/runtime/vm/blob_helper.h index 30af01c6c..e662193dc 100644 --- a/hphp/runtime/vm/blob_helper.h +++ b/hphp/runtime/vm/blob_helper.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef incl_RUNTIME_VM_BLOB_HELPER_H_ -#define incl_RUNTIME_VM_BLOB_HELPER_H_ +#ifndef incl_HPHP_RUNTIME_VM_BLOB_HELPER_H_ +#define incl_HPHP_RUNTIME_VM_BLOB_HELPER_H_ #include #include diff --git a/hphp/runtime/vm/bytecode.h b/hphp/runtime/vm/bytecode.h index aa9ff11f1..e5fcd0739 100644 --- a/hphp/runtime/vm/bytecode.h +++ b/hphp/runtime/vm/bytecode.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef incl_VM_BYTECODE_H_ -#define incl_VM_BYTECODE_H_ +#ifndef incl_HPHP_VM_BYTECODE_H_ +#define incl_HPHP_VM_BYTECODE_H_ #include diff --git a/hphp/runtime/vm/class.h b/hphp/runtime/vm/class.h index 79bfd88f4..617409ff0 100644 --- a/hphp/runtime/vm/class.h +++ b/hphp/runtime/vm/class.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef incl_VM_CLASS_H_ -#define incl_VM_CLASS_H_ +#ifndef incl_HPHP_VM_CLASS_H_ +#define incl_HPHP_VM_CLASS_H_ #include #include diff --git a/hphp/runtime/vm/core_types.h b/hphp/runtime/vm/core_types.h index f92783840..5d2c385f9 100644 --- a/hphp/runtime/vm/core_types.h +++ b/hphp/runtime/vm/core_types.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef incl_VM_CORE_TYPES_H_ -#define incl_VM_CORE_TYPES_H_ +#ifndef incl_HPHP_VM_CORE_TYPES_H_ +#define incl_HPHP_VM_CORE_TYPES_H_ #include diff --git a/hphp/runtime/vm/debug/debug.h b/hphp/runtime/vm/debug/debug.h index 27bb9d3d9..42beb5138 100644 --- a/hphp/runtime/vm/debug/debug.h +++ b/hphp/runtime/vm/debug/debug.h @@ -13,8 +13,8 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#ifndef _TRANSLATOR_DEBUG_H_ -#define _TRANSLATOR_DEBUG_H_ +#ifndef TRANSLATOR_DEBUG_H_ +#define TRANSLATOR_DEBUG_H_ #include #include diff --git a/hphp/runtime/vm/debug/dwarf.h b/hphp/runtime/vm/debug/dwarf.h index c85f57d85..d3319709d 100644 --- a/hphp/runtime/vm/debug/dwarf.h +++ b/hphp/runtime/vm/debug/dwarf.h @@ -13,8 +13,8 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#ifndef _HPHP_DWARF_H_ -#define _HPHP_DWARF_H_ +#ifndef HPHP_DWARF_H_ +#define HPHP_DWARF_H_ #include diff --git a/hphp/runtime/vm/debug/elfwriter.h b/hphp/runtime/vm/debug/elfwriter.h index 57e832e71..3bf39e6aa 100644 --- a/hphp/runtime/vm/debug/elfwriter.h +++ b/hphp/runtime/vm/debug/elfwriter.h @@ -13,8 +13,8 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#ifndef _HPHP_ELFWRITER_H_ -#define _HPHP_ELFWRITER_H_ +#ifndef HPHP_ELFWRITER_H_ +#define HPHP_ELFWRITER_H_ #include #include "dwarf.h" diff --git a/hphp/runtime/vm/debug/gdb-jit.h b/hphp/runtime/vm/debug/gdb-jit.h index 460d4eed8..0e75dfc3e 100644 --- a/hphp/runtime/vm/debug/gdb-jit.h +++ b/hphp/runtime/vm/debug/gdb-jit.h @@ -13,8 +13,8 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#ifndef _GDB_JIT_H_ -#define _GDB_JIT_H_ +#ifndef GDB_JIT_H_ +#define GDB_JIT_H_ #include "dwarf.h" #include diff --git a/hphp/runtime/vm/debugger_hook.h b/hphp/runtime/vm/debugger_hook.h index 8b1fd465c..63bf1438f 100644 --- a/hphp/runtime/vm/debugger_hook.h +++ b/hphp/runtime/vm/debugger_hook.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef incl_DEBUGGER_HOOK_H_ -#define incl_DEBUGGER_HOOK_H_ +#ifndef incl_HPHP_DEBUGGER_HOOK_H_ +#define incl_HPHP_DEBUGGER_HOOK_H_ #include @@ -99,4 +99,4 @@ public: }} // namespace HPHP::VM -#endif /* incl_DEBUGGER_HOOK_H_ */ +#endif /* incl_HPHP_DEBUGGER_HOOK_H_ */ diff --git a/hphp/runtime/vm/event_hook.h b/hphp/runtime/vm/event_hook.h index 8e2586342..31d8e620c 100644 --- a/hphp/runtime/vm/event_hook.h +++ b/hphp/runtime/vm/event_hook.h @@ -13,8 +13,8 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#ifndef incl_VM_EVENT_HOOK_H_ -#define incl_VM_EVENT_HOOK_H_ +#ifndef incl_HPHP_VM_EVENT_HOOK_H_ +#define incl_HPHP_VM_EVENT_HOOK_H_ #include "runtime/base/execution_context.h" #include "runtime/vm/bytecode.h" diff --git a/hphp/runtime/vm/fixed_string_map.h b/hphp/runtime/vm/fixed_string_map.h index 6d308d116..3693de7ee 100644 --- a/hphp/runtime/vm/fixed_string_map.h +++ b/hphp/runtime/vm/fixed_string_map.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __FIXED_STRING_MAP_H__ -#define __FIXED_STRING_MAP_H__ +#ifndef incl_HPHP_FIXED_STRING_MAP_H_ +#define incl_HPHP_FIXED_STRING_MAP_H_ #include #include @@ -51,4 +51,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } } -#endif // __FIXED_STRING_MAP_H__ +#endif // incl_HPHP_FIXED_STRING_MAP_H_ diff --git a/hphp/runtime/vm/func.h b/hphp/runtime/vm/func.h index dbfe81c32..6addef705 100644 --- a/hphp/runtime/vm/func.h +++ b/hphp/runtime/vm/func.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef incl_VM_FUNC_H_ -#define incl_VM_FUNC_H_ +#ifndef incl_HPHP_VM_FUNC_H_ +#define incl_HPHP_VM_FUNC_H_ #include "runtime/vm/bytecode.h" #include "runtime/vm/type_constraint.h" diff --git a/hphp/runtime/vm/func_inline.h b/hphp/runtime/vm/func_inline.h index b509cf401..5e57df3c2 100644 --- a/hphp/runtime/vm/func_inline.h +++ b/hphp/runtime/vm/func_inline.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef incl_VM_FUNC_INLINE_H_ -#define incl_VM_FUNC_INLINE_H_ +#ifndef incl_HPHP_VM_FUNC_INLINE_H_ +#define incl_HPHP_VM_FUNC_INLINE_H_ namespace HPHP { namespace VM { diff --git a/hphp/runtime/vm/funcdict.h b/hphp/runtime/vm/funcdict.h index 29d01d419..a5cacafe9 100644 --- a/hphp/runtime/vm/funcdict.h +++ b/hphp/runtime/vm/funcdict.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef incl_VM_FUNC_DICT_H_ -#define incl_VM_FUNC_DICT_H_ +#ifndef incl_HPHP_VM_FUNC_DICT_H_ +#define incl_HPHP_VM_FUNC_DICT_H_ #include diff --git a/hphp/runtime/vm/hhbc.h b/hphp/runtime/vm/hhbc.h index 1b5e4f933..cb2376285 100644 --- a/hphp/runtime/vm/hhbc.h +++ b/hphp/runtime/vm/hhbc.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef incl_VM_HHBC_H_ -#define incl_VM_HHBC_H_ +#ifndef incl_HPHP_VM_HHBC_H_ +#define incl_HPHP_VM_HHBC_H_ #include diff --git a/hphp/runtime/vm/indexed_string_map.h b/hphp/runtime/vm/indexed_string_map.h index 7c9ed2bc3..a12f4db5b 100644 --- a/hphp/runtime/vm/indexed_string_map.h +++ b/hphp/runtime/vm/indexed_string_map.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef incl_VM_INDEXED_STRING_MAP_H_ -#define incl_VM_INDEXED_STRING_MAP_H_ +#ifndef incl_HPHP_VM_INDEXED_STRING_MAP_H_ +#define incl_HPHP_VM_INDEXED_STRING_MAP_H_ #include #include diff --git a/hphp/runtime/vm/instance.h b/hphp/runtime/vm/instance.h index f26206fc8..52ef71b30 100644 --- a/hphp/runtime/vm/instance.h +++ b/hphp/runtime/vm/instance.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef incl_VM_INSTANCE_H_ -#define incl_VM_INSTANCE_H_ +#ifndef incl_HPHP_VM_INSTANCE_H_ +#define incl_HPHP_VM_INSTANCE_H_ #include "runtime/base/object_data.h" #include "runtime/base/memory/smart_allocator.h" diff --git a/hphp/runtime/vm/instrumentation.h b/hphp/runtime/vm/instrumentation.h index f90a99584..04807f0fc 100644 --- a/hphp/runtime/vm/instrumentation.h +++ b/hphp/runtime/vm/instrumentation.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef incl_INSTRUMENTATION_H_ -#define incl_INSTRUMENTATION_H_ +#ifndef incl_HPHP_INSTRUMENTATION_H_ +#define incl_HPHP_INSTRUMENTATION_H_ #include #include @@ -165,4 +165,4 @@ public: } } // HPHP::VM -#endif /* incl_INSTRUMENTATION_H_ */ +#endif /* incl_HPHP_INSTRUMENTATION_H_ */ diff --git a/hphp/runtime/vm/instrumentation_hook.h b/hphp/runtime/vm/instrumentation_hook.h index 0ba3b1562..e9314c61d 100644 --- a/hphp/runtime/vm/instrumentation_hook.h +++ b/hphp/runtime/vm/instrumentation_hook.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef incl_INSTRUMENTATION_HOOK_H_ -#define incl_INSTRUMENTATION_HOOK_H_ +#ifndef incl_HPHP_INSTRUMENTATION_HOOK_H_ +#define incl_HPHP_INSTRUMENTATION_HOOK_H_ #include #include @@ -61,4 +61,4 @@ static inline void instHookStr(int type, const char* str) { } } // HPHP::VM -#endif /* incl_INSTRUMENTATION_HOOK_H_ */ +#endif /* incl_HPHP_INSTRUMENTATION_HOOK_H_ */ diff --git a/hphp/runtime/vm/member_operations.h b/hphp/runtime/vm/member_operations.h index 7b8ca7374..f29bcd29e 100644 --- a/hphp/runtime/vm/member_operations.h +++ b/hphp/runtime/vm/member_operations.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef incl_VM_MEMBER_OPERATIONS_H_ -#define incl_VM_MEMBER_OPERATIONS_H_ +#ifndef incl_HPHP_VM_MEMBER_OPERATIONS_H_ +#define incl_HPHP_VM_MEMBER_OPERATIONS_H_ #include "runtime/base/types.h" #include "runtime/base/strings.h" @@ -1754,4 +1754,4 @@ inline void UnsetProp(Class* ctx, TypedValue* base, /////////////////////////////////////////////////////////////////////////////// } } -#endif // incl_VM_MEMBER_OPERATIONS_H_ +#endif // incl_HPHP_VM_MEMBER_OPERATIONS_H_ diff --git a/hphp/runtime/vm/name_value_table.h b/hphp/runtime/vm/name_value_table.h index ab553fd7f..29fb706ba 100644 --- a/hphp/runtime/vm/name_value_table.h +++ b/hphp/runtime/vm/name_value_table.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef incl_RUNTIME_VM_NAMEVALUETABLE_H_ -#define incl_RUNTIME_VM_NAMEVALUETABLE_H_ +#ifndef incl_HPHP_RUNTIME_VM_NAMEVALUETABLE_H_ +#define incl_HPHP_RUNTIME_VM_NAMEVALUETABLE_H_ #include #include diff --git a/hphp/runtime/vm/name_value_table_wrapper.h b/hphp/runtime/vm/name_value_table_wrapper.h index d38a9837a..984967842 100644 --- a/hphp/runtime/vm/name_value_table_wrapper.h +++ b/hphp/runtime/vm/name_value_table_wrapper.h @@ -13,8 +13,8 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#ifndef incl_RUNTIME_VM_NAME_VALUE_TABLE_WRAPPER_H -#define incl_RUNTIME_VM_NAME_VALUE_TABLE_WRAPPER_H +#ifndef incl_HPHP_RUNTIME_VM_NAME_VALUE_TABLE_WRAPPER_H +#define incl_HPHP_RUNTIME_VM_NAME_VALUE_TABLE_WRAPPER_H #include "runtime/vm/name_value_table.h" #include "runtime/base/array/array_data.h" diff --git a/hphp/runtime/vm/object_allocator_sizes.h b/hphp/runtime/vm/object_allocator_sizes.h index bc7a7fa2d..8bbb4578f 100644 --- a/hphp/runtime/vm/object_allocator_sizes.h +++ b/hphp/runtime/vm/object_allocator_sizes.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_OBJECT_ALLOCATOR_SIZES_H__ -#define __HPHP_OBJECT_ALLOCATOR_SIZES_H__ +#ifndef incl_HPHP_OBJECT_ALLOCATOR_SIZES_H_ +#define incl_HPHP_OBJECT_ALLOCATOR_SIZES_H_ namespace HPHP { namespace VM { diff --git a/hphp/runtime/vm/pendq.h b/hphp/runtime/vm/pendq.h index 468d31965..638768bd0 100644 --- a/hphp/runtime/vm/pendq.h +++ b/hphp/runtime/vm/pendq.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef incl_PENDQ_H_ -#define incl_PENDQ_H_ +#ifndef incl_HPHP_PENDQ_H_ +#define incl_HPHP_PENDQ_H_ #include diff --git a/hphp/runtime/vm/php_debug.h b/hphp/runtime/vm/php_debug.h index d44b0c716..c1cee623f 100644 --- a/hphp/runtime/vm/php_debug.h +++ b/hphp/runtime/vm/php_debug.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef incl_PHP_DEBUG_H_ -#define incl_PHP_DEBUG_H_ +#ifndef incl_HPHP_PHP_DEBUG_H_ +#define incl_HPHP_PHP_DEBUG_H_ namespace HPHP { @@ -31,4 +31,4 @@ static inline bool phpBreakpointEnabled(const char* sourceName) { } // namespace HPHP -#endif /* incl_PHP_DEBUG_H_ */ +#endif /* incl_HPHP_PHP_DEBUG_H_ */ diff --git a/hphp/runtime/vm/repo.h b/hphp/runtime/vm/repo.h index b9e5608a4..e59d69314 100644 --- a/hphp/runtime/vm/repo.h +++ b/hphp/runtime/vm/repo.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef incl_VM_REPO_H_ -#define incl_VM_REPO_H_ +#ifndef incl_HPHP_VM_REPO_H_ +#define incl_HPHP_VM_REPO_H_ #include "runtime/vm/unit.h" #include "runtime/vm/class.h" diff --git a/hphp/runtime/vm/repo_helpers.h b/hphp/runtime/vm/repo_helpers.h index 3bb7f1943..44e4155ea 100644 --- a/hphp/runtime/vm/repo_helpers.h +++ b/hphp/runtime/vm/repo_helpers.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef incl_VM_REPO_HELPERS_H_ -#define incl_VM_REPO_HELPERS_H_ +#ifndef incl_HPHP_VM_REPO_HELPERS_H_ +#define incl_HPHP_VM_REPO_HELPERS_H_ #include #include diff --git a/hphp/runtime/vm/request_arena.h b/hphp/runtime/vm/request_arena.h index 71985f123..90da75c8f 100644 --- a/hphp/runtime/vm/request_arena.h +++ b/hphp/runtime/vm/request_arena.h @@ -13,8 +13,8 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#ifndef incl_VM_REQUEST_ARENA_H_ -#define incl_VM_REQUEST_ARENA_H_ +#ifndef incl_HPHP_VM_REQUEST_ARENA_H_ +#define incl_HPHP_VM_REQUEST_ARENA_H_ #include diff --git a/hphp/runtime/vm/runtime.h b/hphp/runtime/vm/runtime.h index feac2fac8..2d6c99b4d 100644 --- a/hphp/runtime/vm/runtime.h +++ b/hphp/runtime/vm/runtime.h @@ -13,8 +13,8 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#ifndef incl_VM_RUNTIME_H_ -#define incl_VM_RUNTIME_H_ +#ifndef incl_HPHP_VM_RUNTIME_H_ +#define incl_HPHP_VM_RUNTIME_H_ #include #include diff --git a/hphp/runtime/vm/stats.h b/hphp/runtime/vm/stats.h index d04af4a5d..f842b146d 100644 --- a/hphp/runtime/vm/stats.h +++ b/hphp/runtime/vm/stats.h @@ -13,8 +13,8 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#ifndef _STATS_H_ -#define _STATS_H_ +#ifndef STATS_H_ +#define STATS_H_ #include #include diff --git a/hphp/runtime/vm/translator/abi-x64.h b/hphp/runtime/vm/translator/abi-x64.h index 1dfc7ad36..9d265235e 100644 --- a/hphp/runtime/vm/translator/abi-x64.h +++ b/hphp/runtime/vm/translator/abi-x64.h @@ -23,8 +23,8 @@ * translator. */ -#ifndef incl_VM_RUNTIME_TRANSLATOR_ABI_X64_H_ -#define incl_VM_RUNTIME_TRANSLATOR_ABI_X64_H_ +#ifndef incl_HPHP_VM_RUNTIME_TRANSLATOR_ABI_X64_H_ +#define incl_HPHP_VM_RUNTIME_TRANSLATOR_ABI_X64_H_ #include "util/asm-x64.h" #include "runtime/vm/translator/regalloc.h" diff --git a/hphp/runtime/vm/translator/annotation.h b/hphp/runtime/vm/translator/annotation.h index 82a743679..446b97da5 100644 --- a/hphp/runtime/vm/translator/annotation.h +++ b/hphp/runtime/vm/translator/annotation.h @@ -13,8 +13,8 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#ifndef _ANNOTATION_H_ -#define _ANNOTATION_H_ +#ifndef ANNOTATION_H_ +#define ANNOTATION_H_ #include diff --git a/hphp/runtime/vm/translator/fixup.h b/hphp/runtime/vm/translator/fixup.h index 54408675d..fe58f3fc6 100644 --- a/hphp/runtime/vm/translator/fixup.h +++ b/hphp/runtime/vm/translator/fixup.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef incl_FIXUP_H_ -#define incl_FIXUP_H_ +#ifndef incl_HPHP_FIXUP_H_ +#define incl_HPHP_FIXUP_H_ #include #include diff --git a/hphp/runtime/vm/translator/hooks.h b/hphp/runtime/vm/translator/hooks.h index 203efe7ea..e732e441f 100644 --- a/hphp/runtime/vm/translator/hooks.h +++ b/hphp/runtime/vm/translator/hooks.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef incl_HOOKS_H_ -#define incl_HOOKS_H_ +#ifndef incl_HPHP_HOOKS_H_ +#define incl_HPHP_HOOKS_H_ namespace HPHP { namespace VM { diff --git a/hphp/runtime/vm/translator/hopt/cse.h b/hphp/runtime/vm/translator/hopt/cse.h index 8a0b3acea..74e8bb0bb 100644 --- a/hphp/runtime/vm/translator/hopt/cse.h +++ b/hphp/runtime/vm/translator/hopt/cse.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef incl_HHIR_CSE_H_ -#define incl_HHIR_CSE_H_ +#ifndef incl_HPHP_HHIR_CSE_H_ +#define incl_HPHP_HHIR_CSE_H_ #include diff --git a/hphp/runtime/vm/translator/hopt/opt.h b/hphp/runtime/vm/translator/hopt/opt.h index 8b13e7b60..e31a7c77f 100644 --- a/hphp/runtime/vm/translator/hopt/opt.h +++ b/hphp/runtime/vm/translator/hopt/opt.h @@ -13,8 +13,8 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#ifndef incl_HHIR_OPT_H_ -#define incl_HHIR_OPT_H_ +#ifndef incl_HPHP_HHIR_OPT_H_ +#define incl_HPHP_HHIR_OPT_H_ namespace HPHP { namespace VM { namespace JIT { diff --git a/hphp/runtime/vm/translator/hopt/simplifier.h b/hphp/runtime/vm/translator/hopt/simplifier.h index 32f7dd9a3..834c4a716 100644 --- a/hphp/runtime/vm/translator/hopt/simplifier.h +++ b/hphp/runtime/vm/translator/hopt/simplifier.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef incl_HHVM_HHIR_SIMPLIFIER_H_ -#define incl_HHVM_HHIR_SIMPLIFIER_H_ +#ifndef incl_HPHP_HHVM_HHIR_SIMPLIFIER_H_ +#define incl_HPHP_HHVM_HHIR_SIMPLIFIER_H_ #include "runtime/vm/translator/hopt/cse.h" #include "runtime/vm/translator/hopt/ir.h" diff --git a/hphp/runtime/vm/translator/hopt/tracebuilder.h b/hphp/runtime/vm/translator/hopt/tracebuilder.h index b55e5d2b9..a6ec84e95 100644 --- a/hphp/runtime/vm/translator/hopt/tracebuilder.h +++ b/hphp/runtime/vm/translator/hopt/tracebuilder.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef incl_HHVM_HHIR_TRACEBUILDER_H_ -#define incl_HHVM_HHIR_TRACEBUILDER_H_ +#ifndef incl_HPHP_HHVM_HHIR_TRACEBUILDER_H_ +#define incl_HPHP_HHVM_HHIR_TRACEBUILDER_H_ #include diff --git a/hphp/runtime/vm/translator/hopt/vectortranslator-internal.h b/hphp/runtime/vm/translator/hopt/vectortranslator-internal.h index 1f40a5541..c4ff3cbf4 100644 --- a/hphp/runtime/vm/translator/hopt/vectortranslator-internal.h +++ b/hphp/runtime/vm/translator/hopt/vectortranslator-internal.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef incl_RUNTIME_VM_TRANSLATOR_HOPT_VECTOR_TRANSLATOR_HELPERS_H_ -#define incl_RUNTIME_VM_TRANSLATOR_HOPT_VECTOR_TRANSLATOR_HELPERS_H_ +#ifndef incl_HPHP_RUNTIME_VM_TRANSLATOR_HOPT_VECTOR_TRANSLATOR_HELPERS_H_ +#define incl_HPHP_RUNTIME_VM_TRANSLATOR_HOPT_VECTOR_TRANSLATOR_HELPERS_H_ #include "util/base.h" #include "runtime/base/types.h" diff --git a/hphp/runtime/vm/translator/immstack.h b/hphp/runtime/vm/translator/immstack.h index 2bfdcfe67..f7962e8da 100644 --- a/hphp/runtime/vm/translator/immstack.h +++ b/hphp/runtime/vm/translator/immstack.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __IMMSTACK_H__ -#define __IMMSTACK_H__ +#ifndef incl_HPHP_IMMSTACK_H_ +#define incl_HPHP_IMMSTACK_H_ #include diff --git a/hphp/runtime/vm/translator/regalloc.h b/hphp/runtime/vm/translator/regalloc.h index fc08e8500..11f1dbde2 100644 --- a/hphp/runtime/vm/translator/regalloc.h +++ b/hphp/runtime/vm/translator/regalloc.h @@ -13,8 +13,8 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#ifndef incl_REG_ALLOC_H_ -#define incl_REG_ALLOC_H_ +#ifndef incl_HPHP_REG_ALLOC_H_ +#define incl_HPHP_REG_ALLOC_H_ #include @@ -467,4 +467,4 @@ private: } } } // HPHP::VM::Transl -#endif /* incl_REG_ALLOC_H_ */ +#endif /* incl_HPHP_REG_ALLOC_H_ */ diff --git a/hphp/runtime/vm/translator/runtime-type.h b/hphp/runtime/vm/translator/runtime-type.h index 8eb10ed6f..3a10df069 100644 --- a/hphp/runtime/vm/translator/runtime-type.h +++ b/hphp/runtime/vm/translator/runtime-type.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef incl_RUNTIME_TYPE_H_ -#define incl_RUNTIME_TYPE_H_ +#ifndef incl_HPHP_RUNTIME_TYPE_H_ +#define incl_HPHP_RUNTIME_TYPE_H_ #include "runtime/vm/bytecode.h" @@ -286,4 +286,4 @@ class RuntimeType { } } } -#endif // incl_RUNTIME_TYPE_H_ +#endif // incl_HPHP_RUNTIME_TYPE_H_ diff --git a/hphp/runtime/vm/translator/srcdb.h b/hphp/runtime/vm/translator/srcdb.h index 38b264ba5..8fc012c68 100644 --- a/hphp/runtime/vm/translator/srcdb.h +++ b/hphp/runtime/vm/translator/srcdb.h @@ -13,8 +13,8 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#ifndef _SRCDB_H_ -#define _SRCDB_H_ +#ifndef incl_HPHP_SRCDB_H_ +#define incl_HPHP_SRCDB_H_ #include diff --git a/hphp/runtime/vm/translator/trans-data.h b/hphp/runtime/vm/translator/trans-data.h index ee01fafdb..fea8e50f0 100644 --- a/hphp/runtime/vm/translator/trans-data.h +++ b/hphp/runtime/vm/translator/trans-data.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef _TRANS_DATA_H_ -#define _TRANS_DATA_H_ +#ifndef TRANS_DATA_H_ +#define TRANS_DATA_H_ #include #include diff --git a/hphp/runtime/vm/translator/translator-deps.h b/hphp/runtime/vm/translator/translator-deps.h index 35ce85cd6..a81d75f2c 100644 --- a/hphp/runtime/vm/translator/translator-deps.h +++ b/hphp/runtime/vm/translator/translator-deps.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef _TRANSLATOR_DEPS_H_ -#define _TRANSLATOR_DEPS_H +#ifndef TRANSLATOR_DEPS_H_ +#define TRANSLATOR_DEPS_H #include #include @@ -84,4 +84,4 @@ void unmergePreConsts(const PreConstVec& preConsts, void* owner); } } } // HPHP::VM::Transl -#endif // _TRANSLATOR_DEPS_H_ +#endif // TRANSLATOR_DEPS_H_ diff --git a/hphp/runtime/vm/translator/translator-inline.h b/hphp/runtime/vm/translator/translator-inline.h index c503f5e82..91066b120 100644 --- a/hphp/runtime/vm/translator/translator-inline.h +++ b/hphp/runtime/vm/translator/translator-inline.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef incl_TRANSLATOR_INLINE_H_ -#define incl_TRANSLATOR_INLINE_H_ +#ifndef incl_HPHP_TRANSLATOR_INLINE_H_ +#define incl_HPHP_TRANSLATOR_INLINE_H_ #include "translator.h" #include diff --git a/hphp/runtime/vm/translator/translator-runtime.h b/hphp/runtime/vm/translator/translator-runtime.h index 2847ddf5b..5693dc2b9 100644 --- a/hphp/runtime/vm/translator/translator-runtime.h +++ b/hphp/runtime/vm/translator/translator-runtime.h @@ -13,8 +13,8 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#ifndef incl_TRANSLATOR_RUNTIME_H_ -#define incl_TRANSLATOR_RUNTIME_H_ +#ifndef incl_HPHP_TRANSLATOR_RUNTIME_H_ +#define incl_HPHP_TRANSLATOR_RUNTIME_H_ #include "runtime/base/types.h" #include "runtime/vm/translator/abi-x64.h" diff --git a/hphp/runtime/vm/translator/translator-x64-internal.h b/hphp/runtime/vm/translator/translator-x64-internal.h index fdbb5fab6..1d10bc439 100644 --- a/hphp/runtime/vm/translator/translator-x64-internal.h +++ b/hphp/runtime/vm/translator/translator-x64-internal.h @@ -13,8 +13,8 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#ifndef incl_TRANSLATOR_X64_INTERNAL_H_ -#define incl_TRANSLATOR_X64_INTERNAL_H_ +#ifndef incl_HPHP_TRANSLATOR_X64_INTERNAL_H_ +#define incl_HPHP_TRANSLATOR_X64_INTERNAL_H_ #include #include diff --git a/hphp/runtime/vm/translator/translator-x64.h b/hphp/runtime/vm/translator/translator-x64.h index 4b2ee64e8..b28ac4669 100644 --- a/hphp/runtime/vm/translator/translator-x64.h +++ b/hphp/runtime/vm/translator/translator-x64.h @@ -13,8 +13,8 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#ifndef incl_RUNTIME_VM_TRANSLATOR_X64_H_ -#define incl_RUNTIME_VM_TRANSLATOR_X64_H_ +#ifndef incl_HPHP_RUNTIME_VM_TRANSLATOR_X64_H_ +#define incl_HPHP_RUNTIME_VM_TRANSLATOR_X64_H_ #include #include diff --git a/hphp/runtime/vm/translator/translator.h b/hphp/runtime/vm/translator/translator.h index 54d6e3be9..e044c8892 100644 --- a/hphp/runtime/vm/translator/translator.h +++ b/hphp/runtime/vm/translator/translator.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef _TRANSLATOR_H_ -#define _TRANSLATOR_H_ +#ifndef incl_HPHP_TRANSLATOR_H_ +#define incl_HPHP_TRANSLATOR_H_ #include #include diff --git a/hphp/runtime/vm/translator/types.h b/hphp/runtime/vm/translator/types.h index 16b6964ce..82bfcca63 100644 --- a/hphp/runtime/vm/translator/types.h +++ b/hphp/runtime/vm/translator/types.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef incl_TRANSL_TYPES_H_ -#define incl_TRANSL_TYPES_H_ +#ifndef incl_HPHP_TRANSL_TYPES_H_ +#define incl_HPHP_TRANSL_TYPES_H_ #include "util/base.h" diff --git a/hphp/runtime/vm/translator/unwind-x64.h b/hphp/runtime/vm/translator/unwind-x64.h index 21453a396..17acfe6a0 100644 --- a/hphp/runtime/vm/translator/unwind-x64.h +++ b/hphp/runtime/vm/translator/unwind-x64.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef incl_VM_TRANSLATOR_UNWIND_X64_H_ -#define incl_VM_TRANSLATOR_UNWIND_X64_H_ +#ifndef incl_HPHP_VM_TRANSLATOR_UNWIND_X64_H_ +#define incl_HPHP_VM_TRANSLATOR_UNWIND_X64_H_ #include #include diff --git a/hphp/runtime/vm/translator/writelease.h b/hphp/runtime/vm/translator/writelease.h index 09af0ccf4..0eb54cd16 100644 --- a/hphp/runtime/vm/translator/writelease.h +++ b/hphp/runtime/vm/translator/writelease.h @@ -13,8 +13,8 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#ifndef _WRITELEASE_H_ -#define _WRITELEASE_H_ +#ifndef incl_HPHP_WRITELEASE_H_ +#define incl_HPHP_WRITELEASE_H_ #include @@ -99,4 +99,4 @@ struct BlockingLeaseHolder : public LeaseHolderBase { }}} // HPHP::VM::Transl -#endif /* _WRITELEASE_H_ */ +#endif /* incl_HPHP_WRITELEASE_H_ */ diff --git a/hphp/runtime/vm/translator/x64-util.h b/hphp/runtime/vm/translator/x64-util.h index 6c998d31e..c084568dd 100644 --- a/hphp/runtime/vm/translator/x64-util.h +++ b/hphp/runtime/vm/translator/x64-util.h @@ -13,8 +13,8 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#ifndef _X64_UTIL_H_ -#define _X64_UTIL_H_ +#ifndef X64_UTIL_H_ +#define X64_UTIL_H_ #include #include diff --git a/hphp/runtime/vm/tread_hash_map.h b/hphp/runtime/vm/tread_hash_map.h index be52f9038..3904f3ef3 100644 --- a/hphp/runtime/vm/tread_hash_map.h +++ b/hphp/runtime/vm/tread_hash_map.h @@ -13,8 +13,8 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#ifndef incl_VM_TREAD_HASH_MAP_H_ -#define incl_VM_TREAD_HASH_MAP_H_ +#ifndef incl_HPHP_VM_TREAD_HASH_MAP_H_ +#define incl_HPHP_VM_TREAD_HASH_MAP_H_ #include #include diff --git a/hphp/runtime/vm/treadmill.h b/hphp/runtime/vm/treadmill.h index 3314323d2..be5975b92 100644 --- a/hphp/runtime/vm/treadmill.h +++ b/hphp/runtime/vm/treadmill.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef incl_TREADMILL_H_ -#define incl_TREADMILL_H_ +#ifndef incl_HPHP_TREADMILL_H_ +#define incl_HPHP_TREADMILL_H_ #include "runtime/vm/unit.h" diff --git a/hphp/runtime/vm/type_profile.h b/hphp/runtime/vm/type_profile.h index b4426280c..686d7141a 100644 --- a/hphp/runtime/vm/type_profile.h +++ b/hphp/runtime/vm/type_profile.h @@ -13,8 +13,8 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#ifndef _TYPE_PROFILE_H_ -#define _TYPE_PROFILE_H_ +#ifndef TYPE_PROFILE_H_ +#define TYPE_PROFILE_H_ namespace HPHP { namespace VM { @@ -50,4 +50,4 @@ static inline bool shouldProfile() { } } -#endif // _TYPE_PROFILE_H_ +#endif // TYPE_PROFILE_H_ diff --git a/hphp/runtime/vm/unit.h b/hphp/runtime/vm/unit.h index 38322029f..04cec6b1a 100644 --- a/hphp/runtime/vm/unit.h +++ b/hphp/runtime/vm/unit.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef incl_VM_UNIT_H_ -#define incl_VM_UNIT_H_ +#ifndef incl_HPHP_VM_UNIT_H_ +#define incl_HPHP_VM_UNIT_H_ // Expects that runtime/vm/core_types.h is already included. #include "runtime/base/runtime_option.h" diff --git a/hphp/runtime/vm/verifier/cfg.h b/hphp/runtime/vm/verifier/cfg.h index 2a9e5d6ff..1d6739499 100644 --- a/hphp/runtime/vm/verifier/cfg.h +++ b/hphp/runtime/vm/verifier/cfg.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef incl_VM_VERIFIER_CFG_H_ -#define incl_VM_VERIFIER_CFG_H_ +#ifndef incl_HPHP_VM_VERIFIER_CFG_H_ +#define incl_HPHP_VM_VERIFIER_CFG_H_ #include "runtime/vm/repo.h" #include "runtime/vm/verifier/util.h" @@ -267,4 +267,4 @@ inline Offset fpiPast(const FPIEnt& fpi, PC bc) { }}} // HPHP::VM::Verifier -#endif // incl_VM_VERIFIER_CFG_H_ +#endif // incl_HPHP_VM_VERIFIER_CFG_H_ diff --git a/hphp/runtime/vm/verifier/check.h b/hphp/runtime/vm/verifier/check.h index 4998abee8..e08ce9f50 100644 --- a/hphp/runtime/vm/verifier/check.h +++ b/hphp/runtime/vm/verifier/check.h @@ -18,8 +18,8 @@ * This is the Verifier's public interface. */ -#ifndef incl_VM_VERIFIER_CHECK_H_ -#define incl_VM_VERIFIER_CHECK_H_ +#ifndef incl_HPHP_VM_VERIFIER_CHECK_H_ +#define incl_HPHP_VM_VERIFIER_CHECK_H_ namespace HPHP { namespace VM { @@ -101,4 +101,4 @@ bool checkFunc(const Func*, bool verbose = false); }}} // HPHP::VM::Verifier -#endif // incl_VM_VERIFIER_CHECK_UNIT_H_ +#endif // incl_HPHP_VM_VERIFIER_CHECK_UNIT_H_ diff --git a/hphp/runtime/vm/verifier/pretty.h b/hphp/runtime/vm/verifier/pretty.h index 8b27b3d7f..69827f686 100644 --- a/hphp/runtime/vm/verifier/pretty.h +++ b/hphp/runtime/vm/verifier/pretty.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef incl_VM_VERIFIER_PRETTY_H_ -#define incl_VM_VERIFIER_PRETTY_H_ +#ifndef incl_HPHP_VM_VERIFIER_PRETTY_H_ +#define incl_HPHP_VM_VERIFIER_PRETTY_H_ namespace HPHP { namespace VM { @@ -69,4 +69,4 @@ void verify_error(const char* fmt, ...) __attribute__((format(printf,1,2))); }}} // HPHP::VM::Verifier -#endif // incl_VM_VERIFIER_PRETTY_H +#endif // incl_HPHP_VM_VERIFIER_PRETTY_H diff --git a/hphp/runtime/vm/verifier/util.h b/hphp/runtime/vm/verifier/util.h index 73c12fe25..a87ae858e 100644 --- a/hphp/runtime/vm/verifier/util.h +++ b/hphp/runtime/vm/verifier/util.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef incl_VM_VERIFIER_UTIL_H_ -#define incl_VM_VERIFIER_UTIL_H_ +#ifndef incl_HPHP_VM_VERIFIER_UTIL_H_ +#define incl_HPHP_VM_VERIFIER_UTIL_H_ #include // for size_t #include @@ -61,4 +61,4 @@ inline bool contains(const C &c, T e) { }}} // namespace HPHP::VM::Verifier -#endif // incl_VM_VERIFIER_UTIL_H +#endif // incl_HPHP_VM_VERIFIER_UTIL_H diff --git a/hphp/system/lib/systemlib.h b/hphp/system/lib/systemlib.h index d6137f84d..747382635 100644 --- a/hphp/system/lib/systemlib.h +++ b/hphp/system/lib/systemlib.h @@ -16,8 +16,8 @@ #include -#ifndef __SYSTEMLIB_H__ -#define __SYSTEMLIB_H__ +#ifndef incl_HPHP_SYSTEMLIB_H_ +#define incl_HPHP_SYSTEMLIB_H_ namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/test.h b/hphp/test/test.h index a7dcbcdcb..16f24c5eb 100644 --- a/hphp/test/test.h +++ b/hphp/test/test.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_H__ -#define __TEST_H__ +#ifndef incl_HPHP_TEST_H_ +#define incl_HPHP_TEST_H_ #include #include @@ -86,4 +86,4 @@ private: extern const char *php_path; /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_H__ +#endif // incl_HPHP_TEST_H_ diff --git a/hphp/test/test_base.h b/hphp/test/test_base.h index b0f4bcfc8..c820cb5e7 100644 --- a/hphp/test/test_base.h +++ b/hphp/test/test_base.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_BASE_H__ -#define __TEST_BASE_H__ +#ifndef incl_HPHP_TEST_BASE_H_ +#define incl_HPHP_TEST_BASE_H_ #include #include @@ -136,4 +136,4 @@ typedef WithOption WithNoOpt; /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_BASE_H__ +#endif // incl_HPHP_TEST_BASE_H_ diff --git a/hphp/test/test_code_error.h b/hphp/test/test_code_error.h index 6a02c8326..6e37e052c 100644 --- a/hphp/test/test_code_error.h +++ b/hphp/test/test_code_error.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_CODE_ERROR_H__ -#define __TEST_CODE_ERROR_H__ +#ifndef incl_HPHP_TEST_CODE_ERROR_H_ +#define incl_HPHP_TEST_CODE_ERROR_H_ #include #include @@ -50,4 +50,4 @@ class TestCodeError : public TestBase { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_CODE_ERROR_H__ +#endif // incl_HPHP_TEST_CODE_ERROR_H_ diff --git a/hphp/test/test_code_run.h b/hphp/test/test_code_run.h index 7ea30a67f..53b1ac2c7 100644 --- a/hphp/test/test_code_run.h +++ b/hphp/test/test_code_run.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_CODE_RUN_H__ -#define __TEST_CODE_RUN_H__ +#ifndef incl_HPHP_TEST_CODE_RUN_H_ +#define incl_HPHP_TEST_CODE_RUN_H_ #include @@ -314,4 +314,4 @@ private: /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_CODE_RUN_H__ +#endif // incl_HPHP_TEST_CODE_RUN_H_ diff --git a/hphp/test/test_cpp_base.h b/hphp/test/test_cpp_base.h index ab87f1226..62562d135 100644 --- a/hphp/test/test_cpp_base.h +++ b/hphp/test/test_cpp_base.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_CPP_BASE_H__ -#define __TEST_CPP_BASE_H__ +#ifndef incl_HPHP_TEST_CPP_BASE_H_ +#define incl_HPHP_TEST_CPP_BASE_H_ #include #include @@ -65,4 +65,4 @@ class TestCppBase : public TestBase { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_CPP_BASE_H__ +#endif // incl_HPHP_TEST_CPP_BASE_H_ diff --git a/hphp/test/test_cpp_ext.h b/hphp/test/test_cpp_ext.h index 88719a468..533ab0349 100644 --- a/hphp/test/test_cpp_ext.h +++ b/hphp/test/test_cpp_ext.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_CPP_EXT_H__ -#define __TEST_CPP_EXT_H__ +#ifndef incl_HPHP_TEST_CPP_EXT_H_ +#define incl_HPHP_TEST_CPP_EXT_H_ #include #include // we frequently need to call f_var_dump() @@ -43,4 +43,4 @@ public: /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_CPP_EXT_H__ +#endif // incl_HPHP_TEST_CPP_EXT_H_ diff --git a/hphp/test/test_debugger.h b/hphp/test/test_debugger.h index d9b915918..cdcfd834c 100644 --- a/hphp/test/test_debugger.h +++ b/hphp/test/test_debugger.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_DEBUGGER_H__ -#define __TEST_DEBUGGER_H__ +#ifndef incl_HPHP_TEST_DEBUGGER_H_ +#define incl_HPHP_TEST_DEBUGGER_H_ #include #include @@ -63,4 +63,4 @@ private: /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_DEBUGGER_H__ +#endif // incl_HPHP_TEST_DEBUGGER_H_ diff --git a/hphp/test/test_ext_apache.h b/hphp/test/test_ext_apache.h index 9ea2824c3..3462a2961 100644 --- a/hphp/test/test_ext_apache.h +++ b/hphp/test/test_ext_apache.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_APACHE_H__ -#define __TEST_EXT_APACHE_H__ +#ifndef incl_HPHP_TEST_EXT_APACHE_H_ +#define incl_HPHP_TEST_EXT_APACHE_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -48,4 +48,4 @@ class TestExtApache : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_APACHE_H__ +#endif // incl_HPHP_TEST_EXT_APACHE_H_ diff --git a/hphp/test/test_ext_apc.h b/hphp/test/test_ext_apc.h index 221275244..2ef15f1c4 100644 --- a/hphp/test/test_ext_apc.h +++ b/hphp/test/test_ext_apc.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_APC_H__ -#define __TEST_EXT_APC_H__ +#ifndef incl_HPHP_TEST_EXT_APC_H_ +#define incl_HPHP_TEST_EXT_APC_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -52,4 +52,4 @@ class TestExtApc : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_APC_H__ +#endif // incl_HPHP_TEST_EXT_APC_H_ diff --git a/hphp/test/test_ext_apd.h b/hphp/test/test_ext_apd.h index 84f4ad9fe..6a4ce1db7 100644 --- a/hphp/test/test_ext_apd.h +++ b/hphp/test/test_ext_apd.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_APD_H__ -#define __TEST_EXT_APD_H__ +#ifndef incl_HPHP_TEST_EXT_APD_H_ +#define incl_HPHP_TEST_EXT_APD_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -40,4 +40,4 @@ class TestExtApd : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_APD_H__ +#endif // incl_HPHP_TEST_EXT_APD_H_ diff --git a/hphp/test/test_ext_array.h b/hphp/test/test_ext_array.h index 12de2cd85..839eccc69 100644 --- a/hphp/test/test_ext_array.h +++ b/hphp/test/test_ext_array.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_ARRAY_H__ -#define __TEST_EXT_ARRAY_H__ +#ifndef incl_HPHP_TEST_EXT_ARRAY_H_ +#define incl_HPHP_TEST_EXT_ARRAY_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -110,4 +110,4 @@ class TestExtArray : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_ARRAY_H__ +#endif // incl_HPHP_TEST_EXT_ARRAY_H_ diff --git a/hphp/test/test_ext_asio.h b/hphp/test/test_ext_asio.h index b5105fe10..ad8dfff58 100644 --- a/hphp/test/test_ext_asio.h +++ b/hphp/test/test_ext_asio.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_ASIO_H__ -#define __TEST_EXT_ASIO_H__ +#ifndef incl_HPHP_TEST_EXT_ASIO_H_ +#define incl_HPHP_TEST_EXT_ASIO_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -44,4 +44,4 @@ class TestExtAsio : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_ASIO_H__ +#endif // incl_HPHP_TEST_EXT_ASIO_H_ diff --git a/hphp/test/test_ext_bcmath.h b/hphp/test/test_ext_bcmath.h index a2ceb0f44..58977331a 100644 --- a/hphp/test/test_ext_bcmath.h +++ b/hphp/test/test_ext_bcmath.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_BCMATH_H__ -#define __TEST_EXT_BCMATH_H__ +#ifndef incl_HPHP_TEST_EXT_BCMATH_H_ +#define incl_HPHP_TEST_EXT_BCMATH_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -41,4 +41,4 @@ class TestExtBcmath : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_BCMATH_H__ +#endif // incl_HPHP_TEST_EXT_BCMATH_H_ diff --git a/hphp/test/test_ext_bzip2.h b/hphp/test/test_ext_bzip2.h index 3f35139bb..c6e0bbffd 100644 --- a/hphp/test/test_ext_bzip2.h +++ b/hphp/test/test_ext_bzip2.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_BZIP2_H__ -#define __TEST_EXT_BZIP2_H__ +#ifndef incl_HPHP_TEST_EXT_BZIP2_H_ +#define incl_HPHP_TEST_EXT_BZIP2_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -41,4 +41,4 @@ class TestExtBzip2 : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_BZIP2_H__ +#endif // incl_HPHP_TEST_EXT_BZIP2_H_ diff --git a/hphp/test/test_ext_class.h b/hphp/test/test_ext_class.h index 16f9ac059..6d2b2ae9d 100644 --- a/hphp/test/test_ext_class.h +++ b/hphp/test/test_ext_class.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_CLASS_H__ -#define __TEST_EXT_CLASS_H__ +#ifndef incl_HPHP_TEST_EXT_CLASS_H_ +#define incl_HPHP_TEST_EXT_CLASS_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -47,4 +47,4 @@ class TestExtClass : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_CLASS_H__ +#endif // incl_HPHP_TEST_EXT_CLASS_H_ diff --git a/hphp/test/test_ext_closure.cpp b/hphp/test/test_ext_closure.cpp index 0bb03c514..f2ecee5d2 100644 --- a/hphp/test/test_ext_closure.cpp +++ b/hphp/test/test_ext_closure.cpp @@ -13,7 +13,6 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ - #include #include @@ -33,4 +32,3 @@ bool TestExtClosure::RunTests(const std::string &which) { bool TestExtClosure::test_Closure() { return Count(true); } - diff --git a/hphp/test/test_ext_closure.h b/hphp/test/test_ext_closure.h index f262ff159..6bfd8d7e2 100644 --- a/hphp/test/test_ext_closure.h +++ b/hphp/test/test_ext_closure.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_CLOSURE_H__ -#define __TEST_EXT_CLOSURE_H__ +#ifndef incl_HPHP_TEST_EXT_CLOSURE_H_ +#define incl_HPHP_TEST_EXT_CLOSURE_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -32,4 +32,4 @@ class TestExtClosure : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_CLOSURE_H__ +#endif // incl_HPHP_TEST_EXT_CLOSURE_H_ diff --git a/hphp/test/test_ext_collections.h b/hphp/test/test_ext_collections.h index 747f2036d..346d5ced8 100644 --- a/hphp/test/test_ext_collections.h +++ b/hphp/test/test_ext_collections.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_COLLECTION_H__ -#define __TEST_EXT_COLLECTION_H__ +#ifndef incl_HPHP_TEST_EXT_COLLECTION_H_ +#define incl_HPHP_TEST_EXT_COLLECTION_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -30,4 +30,4 @@ class TestExtCollections : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_COLLECTION_H__ +#endif // incl_HPHP_TEST_EXT_COLLECTION_H_ diff --git a/hphp/test/test_ext_continuation.h b/hphp/test/test_ext_continuation.h index 8e5bf95a8..bc028f818 100644 --- a/hphp/test/test_ext_continuation.h +++ b/hphp/test/test_ext_continuation.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_CONTINUATION_H__ -#define __TEST_EXT_CONTINUATION_H__ +#ifndef incl_HPHP_TEST_EXT_CONTINUATION_H_ +#define incl_HPHP_TEST_EXT_CONTINUATION_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -33,4 +33,4 @@ class TestExtContinuation : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_CONTINUATION_H__ +#endif // incl_HPHP_TEST_EXT_CONTINUATION_H_ diff --git a/hphp/test/test_ext_ctype.h b/hphp/test/test_ext_ctype.h index 1e3a5c7ce..86353e7d9 100644 --- a/hphp/test/test_ext_ctype.h +++ b/hphp/test/test_ext_ctype.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_CTYPE_H__ -#define __TEST_EXT_CTYPE_H__ +#ifndef incl_HPHP_TEST_EXT_CTYPE_H_ +#define incl_HPHP_TEST_EXT_CTYPE_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -42,4 +42,4 @@ class TestExtCtype : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_CTYPE_H__ +#endif // incl_HPHP_TEST_EXT_CTYPE_H_ diff --git a/hphp/test/test_ext_curl.h b/hphp/test/test_ext_curl.h index 75d8f648f..43e84a176 100644 --- a/hphp/test/test_ext_curl.h +++ b/hphp/test/test_ext_curl.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_CURL_H__ -#define __TEST_EXT_CURL_H__ +#ifndef incl_HPHP_TEST_EXT_CURL_H_ +#define incl_HPHP_TEST_EXT_CURL_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -56,4 +56,4 @@ class TestExtCurl : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_CURL_H__ +#endif // incl_HPHP_TEST_EXT_CURL_H_ diff --git a/hphp/test/test_ext_datetime.h b/hphp/test/test_ext_datetime.h index f7155c1d7..1d0fc574c 100644 --- a/hphp/test/test_ext_datetime.h +++ b/hphp/test/test_ext_datetime.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_DATETIME_H__ -#define __TEST_EXT_DATETIME_H__ +#ifndef incl_HPHP_TEST_EXT_DATETIME_H_ +#define incl_HPHP_TEST_EXT_DATETIME_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -79,4 +79,4 @@ class TestExtDatetime : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_DATETIME_H__ +#endif // incl_HPHP_TEST_EXT_DATETIME_H_ diff --git a/hphp/test/test_ext_debugger.h b/hphp/test/test_ext_debugger.h index 878f7341f..627b555bd 100644 --- a/hphp/test/test_ext_debugger.h +++ b/hphp/test/test_ext_debugger.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_DEBUGGER_H__ -#define __TEST_EXT_DEBUGGER_H__ +#ifndef incl_HPHP_TEST_EXT_DEBUGGER_H_ +#define incl_HPHP_TEST_EXT_DEBUGGER_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -33,4 +33,4 @@ class TestExtDebugger : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_DEBUGGER_H__ +#endif // incl_HPHP_TEST_EXT_DEBUGGER_H_ diff --git a/hphp/test/test_ext_domdocument.h b/hphp/test/test_ext_domdocument.h index 7246a7b4f..3cf689af5 100644 --- a/hphp/test/test_ext_domdocument.h +++ b/hphp/test/test_ext_domdocument.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_DOMDOCUMENT_H__ -#define __TEST_EXT_DOMDOCUMENT_H__ +#ifndef incl_HPHP_TEST_EXT_DOMDOCUMENT_H_ +#define incl_HPHP_TEST_EXT_DOMDOCUMENT_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -50,4 +50,4 @@ class TestExtDomdocument : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_DOMDOCUMENT_H__ +#endif // incl_HPHP_TEST_EXT_DOMDOCUMENT_H_ diff --git a/hphp/test/test_ext_error.h b/hphp/test/test_ext_error.h index 6ca0a40d9..b4739bed3 100644 --- a/hphp/test/test_ext_error.h +++ b/hphp/test/test_ext_error.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_ERROR_H__ -#define __TEST_EXT_ERROR_H__ +#ifndef incl_HPHP_TEST_EXT_ERROR_H_ +#define incl_HPHP_TEST_EXT_ERROR_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -42,4 +42,4 @@ class TestExtError : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_ERROR_H__ +#endif // incl_HPHP_TEST_EXT_ERROR_H_ diff --git a/hphp/test/test_ext_fb.h b/hphp/test/test_ext_fb.h index 78a9f7e02..03322021c 100644 --- a/hphp/test/test_ext_fb.h +++ b/hphp/test/test_ext_fb.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_FB_H__ -#define __TEST_EXT_FB_H__ +#ifndef incl_HPHP_TEST_EXT_FB_H_ +#define incl_HPHP_TEST_EXT_FB_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -46,4 +46,4 @@ class TestExtFb : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_FB_H__ +#endif // incl_HPHP_TEST_EXT_FB_H_ diff --git a/hphp/test/test_ext_file.h b/hphp/test/test_ext_file.h index 10eec502d..74e0c90df 100644 --- a/hphp/test/test_ext_file.h +++ b/hphp/test/test_ext_file.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_FILE_H__ -#define __TEST_EXT_FILE_H__ +#ifndef incl_HPHP_TEST_EXT_FILE_H_ +#define incl_HPHP_TEST_EXT_FILE_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -129,4 +129,4 @@ private: /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_FILE_H__ +#endif // incl_HPHP_TEST_EXT_FILE_H_ diff --git a/hphp/test/test_ext_function.h b/hphp/test/test_ext_function.h index 488944289..a03ef8cac 100644 --- a/hphp/test/test_ext_function.h +++ b/hphp/test/test_ext_function.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_FUNCTION_H__ -#define __TEST_EXT_FUNCTION_H__ +#ifndef incl_HPHP_TEST_EXT_FUNCTION_H_ +#define incl_HPHP_TEST_EXT_FUNCTION_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -47,4 +47,4 @@ class TestExtFunction : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_FUNCTION_H__ +#endif // incl_HPHP_TEST_EXT_FUNCTION_H_ diff --git a/hphp/test/test_ext_hash.h b/hphp/test/test_ext_hash.h index e55e1977b..35b1f7f0c 100644 --- a/hphp/test/test_ext_hash.h +++ b/hphp/test/test_ext_hash.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_HASH_H__ -#define __TEST_EXT_HASH_H__ +#ifndef incl_HPHP_TEST_EXT_HASH_H_ +#define incl_HPHP_TEST_EXT_HASH_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -44,4 +44,4 @@ class TestExtHash : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_HASH_H__ +#endif // incl_HPHP_TEST_EXT_HASH_H_ diff --git a/hphp/test/test_ext_iconv.h b/hphp/test/test_ext_iconv.h index f40e57d57..e944a65ef 100644 --- a/hphp/test/test_ext_iconv.h +++ b/hphp/test/test_ext_iconv.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_ICONV_H__ -#define __TEST_EXT_ICONV_H__ +#ifndef incl_HPHP_TEST_EXT_ICONV_H_ +#define incl_HPHP_TEST_EXT_ICONV_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -42,4 +42,4 @@ class TestExtIconv : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_ICONV_H__ +#endif // incl_HPHP_TEST_EXT_ICONV_H_ diff --git a/hphp/test/test_ext_icu.h b/hphp/test/test_ext_icu.h index 49a7cbec3..49929c82d 100644 --- a/hphp/test/test_ext_icu.h +++ b/hphp/test/test_ext_icu.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_ICU_H__ -#define __TEST_EXT_ICU_H__ +#ifndef incl_HPHP_TEST_EXT_ICU_H_ +#define incl_HPHP_TEST_EXT_ICU_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -34,4 +34,4 @@ class TestExtIcu : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_ICU_H__ +#endif // incl_HPHP_TEST_EXT_ICU_H_ diff --git a/hphp/test/test_ext_icu_ucnv.h b/hphp/test/test_ext_icu_ucnv.h index 68ec0b280..2d95201fb 100644 --- a/hphp/test/test_ext_icu_ucnv.h +++ b/hphp/test/test_ext_icu_ucnv.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_ICU_UCNV_H__ -#define __TEST_EXT_ICU_UCNV_H__ +#ifndef incl_HPHP_TEST_EXT_ICU_UCNV_H_ +#define incl_HPHP_TEST_EXT_ICU_UCNV_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -32,4 +32,4 @@ class TestExtIcu_ucnv : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_ICU_UCNV_H__ +#endif // incl_HPHP_TEST_EXT_ICU_UCNV_H_ diff --git a/hphp/test/test_ext_icu_ucsdet.h b/hphp/test/test_ext_icu_ucsdet.h index c7cf26466..d07a7578d 100644 --- a/hphp/test/test_ext_icu_ucsdet.h +++ b/hphp/test/test_ext_icu_ucsdet.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_ICU_UCSDET_H__ -#define __TEST_EXT_ICU_UCSDET_H__ +#ifndef incl_HPHP_TEST_EXT_ICU_UCSDET_H_ +#define incl_HPHP_TEST_EXT_ICU_UCSDET_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -67,4 +67,4 @@ class TestExtIcu_ucsdet : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_ICU_UCSDET_H__ +#endif // incl_HPHP_TEST_EXT_ICU_UCSDET_H_ diff --git a/hphp/test/test_ext_image.h b/hphp/test/test_ext_image.h index 7c5fd56ca..eccf86076 100644 --- a/hphp/test/test_ext_image.h +++ b/hphp/test/test_ext_image.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_IMAGE_H__ -#define __TEST_EXT_IMAGE_H__ +#ifndef incl_HPHP_TEST_EXT_IMAGE_H_ +#define incl_HPHP_TEST_EXT_IMAGE_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -138,4 +138,4 @@ class TestExtImage : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_IMAGE_H__ +#endif // incl_HPHP_TEST_EXT_IMAGE_H_ diff --git a/hphp/test/test_ext_imagesprite.h b/hphp/test/test_ext_imagesprite.h index 81f1a72f1..c49e8a2e6 100644 --- a/hphp/test/test_ext_imagesprite.h +++ b/hphp/test/test_ext_imagesprite.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_IMAGESPRITE_H__ -#define __TEST_EXT_IMAGESPRITE_H__ +#ifndef incl_HPHP_TEST_EXT_IMAGESPRITE_H_ +#define incl_HPHP_TEST_EXT_IMAGESPRITE_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -43,4 +43,4 @@ class TestExtImagesprite : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_IMAGESPRITE_H__ +#endif // incl_HPHP_TEST_EXT_IMAGESPRITE_H_ diff --git a/hphp/test/test_ext_imap.h b/hphp/test/test_ext_imap.h index 28860e632..b8041f526 100644 --- a/hphp/test/test_ext_imap.h +++ b/hphp/test/test_ext_imap.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_IMAP_H__ -#define __TEST_EXT_IMAP_H__ +#ifndef incl_HPHP_TEST_EXT_IMAP_H_ +#define incl_HPHP_TEST_EXT_IMAP_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -99,4 +99,4 @@ class TestExtImap : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_IMAP_H__ +#endif // incl_HPHP_TEST_EXT_IMAP_H_ diff --git a/hphp/test/test_ext_intl.h b/hphp/test/test_ext_intl.h index d3e6b37dc..00bb94dbe 100644 --- a/hphp/test/test_ext_intl.h +++ b/hphp/test/test_ext_intl.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_INTL_H__ -#define __TEST_EXT_INTL_H__ +#ifndef incl_HPHP_TEST_EXT_INTL_H_ +#define incl_HPHP_TEST_EXT_INTL_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -53,4 +53,4 @@ class TestExtIntl : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_INTL_H__ +#endif // incl_HPHP_TEST_EXT_INTL_H_ diff --git a/hphp/test/test_ext_ipc.h b/hphp/test/test_ext_ipc.h index 9e2a0082b..ec22fa2be 100644 --- a/hphp/test/test_ext_ipc.h +++ b/hphp/test/test_ext_ipc.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_IPC_H__ -#define __TEST_EXT_IPC_H__ +#ifndef incl_HPHP_TEST_EXT_IPC_H_ +#define incl_HPHP_TEST_EXT_IPC_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -52,4 +52,4 @@ public: /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_IPC_H__ +#endif // incl_HPHP_TEST_EXT_IPC_H_ diff --git a/hphp/test/test_ext_iterator.h b/hphp/test/test_ext_iterator.h index 639b9868e..e783eea6e 100644 --- a/hphp/test/test_ext_iterator.h +++ b/hphp/test/test_ext_iterator.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_ITERATOR_H__ -#define __TEST_EXT_ITERATOR_H__ +#ifndef incl_HPHP_TEST_EXT_ITERATOR_H_ +#define incl_HPHP_TEST_EXT_ITERATOR_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -77,4 +77,4 @@ class TestExtIterator : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_ITERATOR_H__ +#endif // incl_HPHP_TEST_EXT_ITERATOR_H_ diff --git a/hphp/test/test_ext_json.h b/hphp/test/test_ext_json.h index e6f7ecee7..28dead7e4 100644 --- a/hphp/test/test_ext_json.h +++ b/hphp/test/test_ext_json.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_JSON_H__ -#define __TEST_EXT_JSON_H__ +#ifndef incl_HPHP_TEST_EXT_JSON_H_ +#define incl_HPHP_TEST_EXT_JSON_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -33,4 +33,4 @@ class TestExtJson : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_JSON_H__ +#endif // incl_HPHP_TEST_EXT_JSON_H_ diff --git a/hphp/test/test_ext_ldap.h b/hphp/test/test_ext_ldap.h index be12f6fb7..11a67259f 100644 --- a/hphp/test/test_ext_ldap.h +++ b/hphp/test/test_ext_ldap.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_LDAP_H__ -#define __TEST_EXT_LDAP_H__ +#ifndef incl_HPHP_TEST_EXT_LDAP_H_ +#define incl_HPHP_TEST_EXT_LDAP_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -74,4 +74,4 @@ class TestExtLdap : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_LDAP_H__ +#endif // incl_HPHP_TEST_EXT_LDAP_H_ diff --git a/hphp/test/test_ext_magick.h b/hphp/test/test_ext_magick.h index 5fd37bca9..37e68e6bb 100644 --- a/hphp/test/test_ext_magick.h +++ b/hphp/test/test_ext_magick.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_MAGICK_H__ -#define __TEST_EXT_MAGICK_H__ +#ifndef incl_HPHP_TEST_EXT_MAGICK_H_ +#define incl_HPHP_TEST_EXT_MAGICK_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -459,4 +459,4 @@ class TestExtMagick : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_MAGICK_H__ +#endif // incl_HPHP_TEST_EXT_MAGICK_H_ diff --git a/hphp/test/test_ext_mailparse.h b/hphp/test/test_ext_mailparse.h index 0dc8a9b69..20b1b95e9 100644 --- a/hphp/test/test_ext_mailparse.h +++ b/hphp/test/test_ext_mailparse.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_MAILPARSE_H__ -#define __TEST_EXT_MAILPARSE_H__ +#ifndef incl_HPHP_TEST_EXT_MAILPARSE_H_ +#define incl_HPHP_TEST_EXT_MAILPARSE_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -47,4 +47,4 @@ class TestExtMailparse : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_MAILPARSE_H__ +#endif // incl_HPHP_TEST_EXT_MAILPARSE_H_ diff --git a/hphp/test/test_ext_math.h b/hphp/test/test_ext_math.h index 5e98b0762..646a6581a 100644 --- a/hphp/test/test_ext_math.h +++ b/hphp/test/test_ext_math.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_MATH_H__ -#define __TEST_EXT_MATH_H__ +#ifndef incl_HPHP_TEST_EXT_MATH_H_ +#define incl_HPHP_TEST_EXT_MATH_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -79,4 +79,4 @@ class TestExtMath : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_MATH_H__ +#endif // incl_HPHP_TEST_EXT_MATH_H_ diff --git a/hphp/test/test_ext_mb.h b/hphp/test/test_ext_mb.h index db9ee1f18..8814b8cbb 100644 --- a/hphp/test/test_ext_mb.h +++ b/hphp/test/test_ext_mb.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_MB_H__ -#define __TEST_EXT_MB_H__ +#ifndef incl_HPHP_TEST_EXT_MB_H_ +#define incl_HPHP_TEST_EXT_MB_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -86,4 +86,4 @@ class TestExtMb : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_MB_H__ +#endif // incl_HPHP_TEST_EXT_MB_H_ diff --git a/hphp/test/test_ext_mcrypt.h b/hphp/test/test_ext_mcrypt.h index 4b41e8db0..da85a1c17 100644 --- a/hphp/test/test_ext_mcrypt.h +++ b/hphp/test/test_ext_mcrypt.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_MCRYPT_H__ -#define __TEST_EXT_MCRYPT_H__ +#ifndef incl_HPHP_TEST_EXT_MCRYPT_H_ +#define incl_HPHP_TEST_EXT_MCRYPT_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -68,4 +68,4 @@ class TestExtMcrypt : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_MCRYPT_H__ +#endif // incl_HPHP_TEST_EXT_MCRYPT_H_ diff --git a/hphp/test/test_ext_memcache.h b/hphp/test/test_ext_memcache.h index c0db768b2..e5941a177 100644 --- a/hphp/test/test_ext_memcache.h +++ b/hphp/test/test_ext_memcache.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_MEMCACHE_H__ -#define __TEST_EXT_MEMCACHE_H__ +#ifndef incl_HPHP_TEST_EXT_MEMCACHE_H_ +#define incl_HPHP_TEST_EXT_MEMCACHE_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -51,4 +51,4 @@ class TestExtMemcache : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_MEMCACHE_H__ +#endif // incl_HPHP_TEST_EXT_MEMCACHE_H_ diff --git a/hphp/test/test_ext_memcached.h b/hphp/test/test_ext_memcached.h index 4f22c3d9e..3f1eca78f 100644 --- a/hphp/test/test_ext_memcached.h +++ b/hphp/test/test_ext_memcached.h @@ -16,8 +16,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_MEMCACHED_H__ -#define __TEST_EXT_MEMCACHED_H__ +#ifndef incl_HPHP_TEST_EXT_MEMCACHED_H_ +#define incl_HPHP_TEST_EXT_MEMCACHED_H_ #include @@ -36,4 +36,4 @@ class TestExtMemcached : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_MEMCACHED_H__ +#endif // incl_HPHP_TEST_EXT_MEMCACHED_H_ diff --git a/hphp/test/test_ext_misc.h b/hphp/test/test_ext_misc.h index 22cd6cca4..e6f29125f 100644 --- a/hphp/test/test_ext_misc.h +++ b/hphp/test/test_ext_misc.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_MISC_H__ -#define __TEST_EXT_MISC_H__ +#ifndef incl_HPHP_TEST_EXT_MISC_H_ +#define incl_HPHP_TEST_EXT_MISC_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -58,4 +58,4 @@ class TestExtMisc : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_MISC_H__ +#endif // incl_HPHP_TEST_EXT_MISC_H_ diff --git a/hphp/test/test_ext_mysql.h b/hphp/test/test_ext_mysql.h index 744ec9e14..4849bc81b 100644 --- a/hphp/test/test_ext_mysql.h +++ b/hphp/test/test_ext_mysql.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_MYSQL_H__ -#define __TEST_EXT_MYSQL_H__ +#ifndef incl_HPHP_TEST_EXT_MYSQL_H_ +#define incl_HPHP_TEST_EXT_MYSQL_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -84,4 +84,4 @@ class TestExtMysql : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_MYSQL_H__ +#endif // incl_HPHP_TEST_EXT_MYSQL_H_ diff --git a/hphp/test/test_ext_network.h b/hphp/test/test_ext_network.h index 810be1da0..b4859aae4 100644 --- a/hphp/test/test_ext_network.h +++ b/hphp/test/test_ext_network.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_NETWORK_H__ -#define __TEST_EXT_NETWORK_H__ +#ifndef incl_HPHP_TEST_EXT_NETWORK_H_ +#define incl_HPHP_TEST_EXT_NETWORK_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -65,4 +65,4 @@ class TestExtNetwork : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_NETWORK_H__ +#endif // incl_HPHP_TEST_EXT_NETWORK_H_ diff --git a/hphp/test/test_ext_openssl.h b/hphp/test/test_ext_openssl.h index 4d2cfaaba..cc60cef94 100644 --- a/hphp/test/test_ext_openssl.h +++ b/hphp/test/test_ext_openssl.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_OPENSSL_H__ -#define __TEST_EXT_OPENSSL_H__ +#ifndef incl_HPHP_TEST_EXT_OPENSSL_H_ +#define incl_HPHP_TEST_EXT_OPENSSL_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -72,4 +72,4 @@ class TestExtOpenssl : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_OPENSSL_H__ +#endif // incl_HPHP_TEST_EXT_OPENSSL_H_ diff --git a/hphp/test/test_ext_options.h b/hphp/test/test_ext_options.h index 2e277053d..070feb75f 100644 --- a/hphp/test/test_ext_options.h +++ b/hphp/test/test_ext_options.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_OPTIONS_H__ -#define __TEST_EXT_OPTIONS_H__ +#ifndef incl_HPHP_TEST_EXT_OPTIONS_H_ +#define incl_HPHP_TEST_EXT_OPTIONS_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -83,4 +83,4 @@ class TestExtOptions : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_OPTIONS_H__ +#endif // incl_HPHP_TEST_EXT_OPTIONS_H_ diff --git a/hphp/test/test_ext_output.h b/hphp/test/test_ext_output.h index 2a9ab53ba..947a7ab67 100644 --- a/hphp/test/test_ext_output.h +++ b/hphp/test/test_ext_output.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_OUTPUT_H__ -#define __TEST_EXT_OUTPUT_H__ +#ifndef incl_HPHP_TEST_EXT_OUTPUT_H_ +#define incl_HPHP_TEST_EXT_OUTPUT_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -53,4 +53,4 @@ class TestExtOutput : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_OUTPUT_H__ +#endif // incl_HPHP_TEST_EXT_OUTPUT_H_ diff --git a/hphp/test/test_ext_pdo.h b/hphp/test/test_ext_pdo.h index 4810d6035..75650cdbb 100644 --- a/hphp/test/test_ext_pdo.h +++ b/hphp/test/test_ext_pdo.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_PDO_H__ -#define __TEST_EXT_PDO_H__ +#ifndef incl_HPHP_TEST_EXT_PDO_H_ +#define incl_HPHP_TEST_EXT_PDO_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -34,4 +34,4 @@ class TestExtPdo : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_PDO_H__ +#endif // incl_HPHP_TEST_EXT_PDO_H_ diff --git a/hphp/test/test_ext_posix.h b/hphp/test/test_ext_posix.h index 0ecd24358..7d081c4a3 100644 --- a/hphp/test/test_ext_posix.h +++ b/hphp/test/test_ext_posix.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_POSIX_H__ -#define __TEST_EXT_POSIX_H__ +#ifndef incl_HPHP_TEST_EXT_POSIX_H_ +#define incl_HPHP_TEST_EXT_POSIX_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -66,4 +66,4 @@ class TestExtPosix : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_POSIX_H__ +#endif // incl_HPHP_TEST_EXT_POSIX_H_ diff --git a/hphp/test/test_ext_preg.h b/hphp/test/test_ext_preg.h index 4a6f13c27..054443893 100644 --- a/hphp/test/test_ext_preg.h +++ b/hphp/test/test_ext_preg.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_PREG_H__ -#define __TEST_EXT_PREG_H__ +#ifndef incl_HPHP_TEST_EXT_PREG_H_ +#define incl_HPHP_TEST_EXT_PREG_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -46,4 +46,4 @@ class TestExtPreg : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_PREG_H__ +#endif // incl_HPHP_TEST_EXT_PREG_H_ diff --git a/hphp/test/test_ext_process.h b/hphp/test/test_ext_process.h index 27d443f2e..4bf23cc6c 100644 --- a/hphp/test/test_ext_process.h +++ b/hphp/test/test_ext_process.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_PROCESS_H__ -#define __TEST_EXT_PROCESS_H__ +#ifndef incl_HPHP_TEST_EXT_PROCESS_H_ +#define incl_HPHP_TEST_EXT_PROCESS_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -57,4 +57,4 @@ class TestExtProcess : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_PROCESS_H__ +#endif // incl_HPHP_TEST_EXT_PROCESS_H_ diff --git a/hphp/test/test_ext_reflection.h b/hphp/test/test_ext_reflection.h index c0bfc07e1..eb05fa2fc 100644 --- a/hphp/test/test_ext_reflection.h +++ b/hphp/test/test_ext_reflection.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_REFLECTION_H__ -#define __TEST_EXT_REFLECTION_H__ +#ifndef incl_HPHP_TEST_EXT_REFLECTION_H_ +#define incl_HPHP_TEST_EXT_REFLECTION_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -42,4 +42,4 @@ class TestExtReflection : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_REFLECTION_H__ +#endif // incl_HPHP_TEST_EXT_REFLECTION_H_ diff --git a/hphp/test/test_ext_server.h b/hphp/test/test_ext_server.h index c8b9d99fd..f7edeb80e 100644 --- a/hphp/test/test_ext_server.h +++ b/hphp/test/test_ext_server.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_SERVER_H__ -#define __TEST_EXT_SERVER_H__ +#ifndef incl_HPHP_TEST_EXT_SERVER_H_ +#define incl_HPHP_TEST_EXT_SERVER_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -41,4 +41,4 @@ class TestExtServer : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_SERVER_H__ +#endif // incl_HPHP_TEST_EXT_SERVER_H_ diff --git a/hphp/test/test_ext_session.h b/hphp/test/test_ext_session.h index e4ca578e8..cf62adf03 100644 --- a/hphp/test/test_ext_session.h +++ b/hphp/test/test_ext_session.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_SESSION_H__ -#define __TEST_EXT_SESSION_H__ +#ifndef incl_HPHP_TEST_EXT_SESSION_H_ +#define incl_HPHP_TEST_EXT_SESSION_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -51,4 +51,4 @@ class TestExtSession : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_SESSION_H__ +#endif // incl_HPHP_TEST_EXT_SESSION_H_ diff --git a/hphp/test/test_ext_simplexml.h b/hphp/test/test_ext_simplexml.h index a9adfe836..dbd44dfeb 100644 --- a/hphp/test/test_ext_simplexml.h +++ b/hphp/test/test_ext_simplexml.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_SIMPLEXML_H__ -#define __TEST_EXT_SIMPLEXML_H__ +#ifndef incl_HPHP_TEST_EXT_SIMPLEXML_H_ +#define incl_HPHP_TEST_EXT_SIMPLEXML_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -41,4 +41,4 @@ class TestExtSimplexml : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_SIMPLEXML_H__ +#endif // incl_HPHP_TEST_EXT_SIMPLEXML_H_ diff --git a/hphp/test/test_ext_soap.h b/hphp/test/test_ext_soap.h index 898a99169..39b6731ee 100644 --- a/hphp/test/test_ext_soap.h +++ b/hphp/test/test_ext_soap.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_SOAP_H__ -#define __TEST_EXT_SOAP_H__ +#ifndef incl_HPHP_TEST_EXT_SOAP_H_ +#define incl_HPHP_TEST_EXT_SOAP_H_ #include #include @@ -78,4 +78,4 @@ private: /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_SOAP_H__ +#endif // incl_HPHP_TEST_EXT_SOAP_H_ diff --git a/hphp/test/test_ext_socket.h b/hphp/test/test_ext_socket.h index c83dbca8c..72627292c 100644 --- a/hphp/test/test_ext_socket.h +++ b/hphp/test/test_ext_socket.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_SOCKET_H__ -#define __TEST_EXT_SOCKET_H__ +#ifndef incl_HPHP_TEST_EXT_SOCKET_H_ +#define incl_HPHP_TEST_EXT_SOCKET_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -57,4 +57,4 @@ class TestExtSocket : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_SOCKET_H__ +#endif // incl_HPHP_TEST_EXT_SOCKET_H_ diff --git a/hphp/test/test_ext_spl.h b/hphp/test/test_ext_spl.h index 8aea82fc5..6c19bc9f5 100644 --- a/hphp/test/test_ext_spl.h +++ b/hphp/test/test_ext_spl.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_SPL_H__ -#define __TEST_EXT_SPL_H__ +#ifndef incl_HPHP_TEST_EXT_SPL_H_ +#define incl_HPHP_TEST_EXT_SPL_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -44,4 +44,4 @@ class TestExtSpl : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_SPL_H__ +#endif // incl_HPHP_TEST_EXT_SPL_H_ diff --git a/hphp/test/test_ext_splfile.h b/hphp/test/test_ext_splfile.h index f51557193..a2499868d 100644 --- a/hphp/test/test_ext_splfile.h +++ b/hphp/test/test_ext_splfile.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_SPLFILE_H__ -#define __TEST_EXT_SPLFILE_H__ +#ifndef incl_HPHP_TEST_EXT_SPLFILE_H_ +#define incl_HPHP_TEST_EXT_SPLFILE_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -86,4 +86,4 @@ class TestExtSplfile : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_SPLFILE_H__ +#endif // incl_HPHP_TEST_EXT_SPLFILE_H_ diff --git a/hphp/test/test_ext_sqlite3.h b/hphp/test/test_ext_sqlite3.h index ea3e00593..ada4e71f2 100644 --- a/hphp/test/test_ext_sqlite3.h +++ b/hphp/test/test_ext_sqlite3.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_SQLITE3_H__ -#define __TEST_EXT_SQLITE3_H__ +#ifndef incl_HPHP_TEST_EXT_SQLITE3_H_ +#define incl_HPHP_TEST_EXT_SQLITE3_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -34,4 +34,4 @@ class TestExtSqlite3 : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_SQLITE3_H__ +#endif // incl_HPHP_TEST_EXT_SQLITE3_H_ diff --git a/hphp/test/test_ext_stream.h b/hphp/test/test_ext_stream.h index 8758136bb..00c4dd1a6 100644 --- a/hphp/test/test_ext_stream.h +++ b/hphp/test/test_ext_stream.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_STREAM_H__ -#define __TEST_EXT_STREAM_H__ +#ifndef incl_HPHP_TEST_EXT_STREAM_H_ +#define incl_HPHP_TEST_EXT_STREAM_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -72,4 +72,4 @@ class TestExtStream : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_STREAM_H__ +#endif // incl_HPHP_TEST_EXT_STREAM_H_ diff --git a/hphp/test/test_ext_string.h b/hphp/test/test_ext_string.h index 514c47da5..c3f88e614 100644 --- a/hphp/test/test_ext_string.h +++ b/hphp/test/test_ext_string.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_STRING_H__ -#define __TEST_EXT_STRING_H__ +#ifndef incl_HPHP_TEST_EXT_STRING_H_ +#define incl_HPHP_TEST_EXT_STRING_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -123,4 +123,4 @@ class TestExtString : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_STRING_H__ +#endif // incl_HPHP_TEST_EXT_STRING_H_ diff --git a/hphp/test/test_ext_thread.h b/hphp/test/test_ext_thread.h index 025a02893..44d09bb04 100644 --- a/hphp/test/test_ext_thread.h +++ b/hphp/test/test_ext_thread.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_THREAD_H__ -#define __TEST_EXT_THREAD_H__ +#ifndef incl_HPHP_TEST_EXT_THREAD_H_ +#define incl_HPHP_TEST_EXT_THREAD_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -37,4 +37,4 @@ class TestExtThread : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_THREAD_H__ +#endif // incl_HPHP_TEST_EXT_THREAD_H_ diff --git a/hphp/test/test_ext_thrift.h b/hphp/test/test_ext_thrift.h index a11e5f358..af9f672ed 100644 --- a/hphp/test/test_ext_thrift.h +++ b/hphp/test/test_ext_thrift.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_THRIFT_H__ -#define __TEST_EXT_THRIFT_H__ +#ifndef incl_HPHP_TEST_EXT_THRIFT_H_ +#define incl_HPHP_TEST_EXT_THRIFT_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -35,4 +35,4 @@ class TestExtThrift : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_THRIFT_H__ +#endif // incl_HPHP_TEST_EXT_THRIFT_H_ diff --git a/hphp/test/test_ext_url.h b/hphp/test/test_ext_url.h index 0cbe37d61..9b560bc14 100644 --- a/hphp/test/test_ext_url.h +++ b/hphp/test/test_ext_url.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_URL_H__ -#define __TEST_EXT_URL_H__ +#ifndef incl_HPHP_TEST_EXT_URL_H_ +#define incl_HPHP_TEST_EXT_URL_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -41,4 +41,4 @@ class TestExtUrl : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_URL_H__ +#endif // incl_HPHP_TEST_EXT_URL_H_ diff --git a/hphp/test/test_ext_variable.h b/hphp/test/test_ext_variable.h index b6357a3af..3d02ebe01 100644 --- a/hphp/test/test_ext_variable.h +++ b/hphp/test/test_ext_variable.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_VARIABLE_H__ -#define __TEST_EXT_VARIABLE_H__ +#ifndef incl_HPHP_TEST_EXT_VARIABLE_H_ +#define incl_HPHP_TEST_EXT_VARIABLE_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -61,4 +61,4 @@ class TestExtVariable : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_VARIABLE_H__ +#endif // incl_HPHP_TEST_EXT_VARIABLE_H_ diff --git a/hphp/test/test_ext_xml.h b/hphp/test/test_ext_xml.h index 0380cbcc0..084a4313b 100644 --- a/hphp/test/test_ext_xml.h +++ b/hphp/test/test_ext_xml.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_XML_H__ -#define __TEST_EXT_XML_H__ +#ifndef incl_HPHP_TEST_EXT_XML_H_ +#define incl_HPHP_TEST_EXT_XML_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -55,4 +55,4 @@ class TestExtXml : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_XML_H__ +#endif // incl_HPHP_TEST_EXT_XML_H_ diff --git a/hphp/test/test_ext_xmlreader.h b/hphp/test/test_ext_xmlreader.h index da2b2ec2f..70ec98bac 100644 --- a/hphp/test/test_ext_xmlreader.h +++ b/hphp/test/test_ext_xmlreader.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_XMLREADER_H__ -#define __TEST_EXT_XMLREADER_H__ +#ifndef incl_HPHP_TEST_EXT_XMLREADER_H_ +#define incl_HPHP_TEST_EXT_XMLREADER_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -33,4 +33,4 @@ class TestExtXmlreader : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_XMLREADER_H__ +#endif // incl_HPHP_TEST_EXT_XMLREADER_H_ diff --git a/hphp/test/test_ext_xmlwriter.h b/hphp/test/test_ext_xmlwriter.h index acbaa01b3..f99214623 100644 --- a/hphp/test/test_ext_xmlwriter.h +++ b/hphp/test/test_ext_xmlwriter.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_XMLWRITER_H__ -#define __TEST_EXT_XMLWRITER_H__ +#ifndef incl_HPHP_TEST_EXT_XMLWRITER_H_ +#define incl_HPHP_TEST_EXT_XMLWRITER_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -74,4 +74,4 @@ class TestExtXmlwriter : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_XMLWRITER_H__ +#endif // incl_HPHP_TEST_EXT_XMLWRITER_H_ diff --git a/hphp/test/test_ext_zlib.h b/hphp/test/test_ext_zlib.h index 2b8ce9d9e..03be27b87 100644 --- a/hphp/test/test_ext_zlib.h +++ b/hphp/test/test_ext_zlib.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_EXT_ZLIB_H__ -#define __TEST_EXT_ZLIB_H__ +#ifndef incl_HPHP_TEST_EXT_ZLIB_H_ +#define incl_HPHP_TEST_EXT_ZLIB_H_ // >>>>>> Generated by idl.php. Do NOT modify. <<<<<< @@ -62,4 +62,4 @@ class TestExtZlib : public TestCppExt { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_EXT_ZLIB_H__ +#endif // incl_HPHP_TEST_EXT_ZLIB_H_ diff --git a/hphp/test/test_logger.h b/hphp/test/test_logger.h index 160df0003..266cfa127 100644 --- a/hphp/test/test_logger.h +++ b/hphp/test/test_logger.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_LOGGER_H__ -#define __TEST_LOGGER_H__ +#ifndef incl_HPHP_TEST_LOGGER_H_ +#define incl_HPHP_TEST_LOGGER_H_ #include #include @@ -45,4 +45,4 @@ private: std::string getGitRevision(); }; -#endif // __TEST_LOGGER_H__ +#endif // incl_HPHP_TEST_LOGGER_H_ diff --git a/hphp/test/test_parser.h b/hphp/test/test_parser.h index a706ddeed..d3e70c7d5 100644 --- a/hphp/test/test_parser.h +++ b/hphp/test/test_parser.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_PARSER_H__ -#define __TEST_PARSER_H__ +#ifndef incl_HPHP_TEST_PARSER_H_ +#define incl_HPHP_TEST_PARSER_H_ #include @@ -39,4 +39,4 @@ class TestParser : public TestBase { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_PARSER_H__ +#endif // incl_HPHP_TEST_PARSER_H_ diff --git a/hphp/test/test_parser_expr.h b/hphp/test/test_parser_expr.h index bbef41845..573c69247 100644 --- a/hphp/test/test_parser_expr.h +++ b/hphp/test/test_parser_expr.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_PARSER_EXPR_H__ -#define __TEST_PARSER_EXPR_H__ +#ifndef incl_HPHP_TEST_PARSER_EXPR_H_ +#define incl_HPHP_TEST_PARSER_EXPR_H_ #include @@ -56,4 +56,4 @@ class TestParserExpr : public TestParser { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_PARSER_EXPR_H__ +#endif // incl_HPHP_TEST_PARSER_EXPR_H_ diff --git a/hphp/test/test_parser_stmt.h b/hphp/test/test_parser_stmt.h index a774e725a..fb73d899c 100644 --- a/hphp/test/test_parser_stmt.h +++ b/hphp/test/test_parser_stmt.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_PARSER_STMT_H__ -#define __TEST_PARSER_STMT_H__ +#ifndef incl_HPHP_TEST_PARSER_STMT_H_ +#define incl_HPHP_TEST_PARSER_STMT_H_ #include @@ -59,4 +59,4 @@ class TestParserStmt : public TestParser { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_PARSER_STMT_H__ +#endif // incl_HPHP_TEST_PARSER_STMT_H_ diff --git a/hphp/test/test_server.h b/hphp/test/test_server.h index d11de6357..adf7cf490 100644 --- a/hphp/test/test_server.h +++ b/hphp/test/test_server.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_SERVER_H__ -#define __TEST_SERVER_H__ +#ifndef incl_HPHP_TEST_SERVER_H_ +#define incl_HPHP_TEST_SERVER_H_ #include #include @@ -140,4 +140,4 @@ protected: /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_SERVER_H__ +#endif // incl_HPHP_TEST_SERVER_H_ diff --git a/hphp/test/test_util.h b/hphp/test/test_util.h index c34ea0789..37ba6407b 100644 --- a/hphp/test/test_util.h +++ b/hphp/test/test_util.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TEST_UTIL_H__ -#define __TEST_UTIL_H__ +#ifndef incl_HPHP_TEST_UTIL_H_ +#define incl_HPHP_TEST_UTIL_H_ #include #include @@ -36,4 +36,4 @@ class TestUtil : public TestBase { /////////////////////////////////////////////////////////////////////////////// -#endif // __TEST_CPP_BASE_H__ +#endif // incl_HPHP_TEST_CPP_BASE_H_ diff --git a/hphp/util/alloc.h b/hphp/util/alloc.h index 22f65c1a6..f8d2595d7 100644 --- a/hphp/util/alloc.h +++ b/hphp/util/alloc.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_UTIL_ALLOC_H__ -#define __HPHP_UTIL_ALLOC_H__ +#ifndef incl_HPHP_UTIL_ALLOC_H_ +#define incl_HPHP_UTIL_ALLOC_H_ #include @@ -161,4 +161,4 @@ extern const size_t s_pageSize; /////////////////////////////////////////////////////////////////////////////// }} -#endif // __HPHP_UTIL_ALLOC_H__ +#endif // incl_HPHP_UTIL_ALLOC_H_ diff --git a/hphp/util/arena.h b/hphp/util/arena.h index cb94ca103..2dbf49663 100644 --- a/hphp/util/arena.h +++ b/hphp/util/arena.h @@ -13,8 +13,8 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#ifndef incl_UTIL_ARENA_H_ -#define incl_UTIL_ARENA_H_ +#ifndef incl_HPHP_UTIL_ARENA_H_ +#define incl_HPHP_UTIL_ARENA_H_ #include #include diff --git a/hphp/util/asm-x64.h b/hphp/util/asm-x64.h index 55783dd6f..bf978bd31 100644 --- a/hphp/util/asm-x64.h +++ b/hphp/util/asm-x64.h @@ -13,8 +13,8 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#ifndef incl_UTIL_ASM_X64_H_ -#define incl_UTIL_ASM_X64_H_ +#ifndef incl_HPHP_UTIL_ASM_X64_H_ +#define incl_HPHP_UTIL_ASM_X64_H_ #include diff --git a/hphp/util/async_func.h b/hphp/util/async_func.h index d1d20beda..c8d99506b 100644 --- a/hphp/util/async_func.h +++ b/hphp/util/async_func.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __CONCURRENCY_ASYNC_FUNC_H__ -#define __CONCURRENCY_ASYNC_FUNC_H__ +#ifndef incl_HPHP_CONCURRENCY_ASYNC_FUNC_H_ +#define incl_HPHP_CONCURRENCY_ASYNC_FUNC_H_ #include "base.h" #include @@ -205,4 +205,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __CONCURRENCY_ASYNC_FUNC_H__ +#endif // incl_HPHP_CONCURRENCY_ASYNC_FUNC_H_ diff --git a/hphp/util/async_job.h b/hphp/util/async_job.h index 494e0ef39..ab9879498 100644 --- a/hphp/util/async_job.h +++ b/hphp/util/async_job.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __ASYNC_JOB_H__ -#define __ASYNC_JOB_H__ +#ifndef incl_HPHP_ASYNC_JOB_H_ +#define incl_HPHP_ASYNC_JOB_H_ #include "base.h" #include "async_func.h" @@ -188,4 +188,4 @@ class JobDispatcher { /////////////////////////////////////////////////////////////////////////////// } -#endif // __ASYNC_JOB_H__ +#endif // incl_HPHP_ASYNC_JOB_H_ diff --git a/hphp/util/atomic.h b/hphp/util/atomic.h index da173ab25..1c2c3bb4c 100644 --- a/hphp/util/atomic.h +++ b/hphp/util/atomic.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef incl_ATOMIC_H_ -#define incl_ATOMIC_H_ +#ifndef incl_HPHP_ATOMIC_H_ +#define incl_HPHP_ATOMIC_H_ #include #include diff --git a/hphp/util/biased_coin.h b/hphp/util/biased_coin.h index 2813e5019..dd4682075 100644 --- a/hphp/util/biased_coin.h +++ b/hphp/util/biased_coin.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef incl_BIASED_COIN_H_ -#define incl_BIASED_COIN_H_ +#ifndef incl_HPHP_BIASED_COIN_H_ +#define incl_HPHP_BIASED_COIN_H_ #include "util/assertions.h" #include "util/trace.h" diff --git a/hphp/util/bitops.h b/hphp/util/bitops.h index 51fcaf0ec..e5caa0318 100644 --- a/hphp/util/bitops.h +++ b/hphp/util/bitops.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef incl_BITOPS_H_ -#define incl_BITOPS_H_ +#ifndef incl_HPHP_BITOPS_H_ +#define incl_HPHP_BITOPS_H_ namespace HPHP { diff --git a/hphp/util/bits.h b/hphp/util/bits.h index 609840c65..cec14b97c 100644 --- a/hphp/util/bits.h +++ b/hphp/util/bits.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __BITS_H__ -#define __BITS_H__ +#ifndef incl_HPHP_BITS_H_ +#define incl_HPHP_BITS_H_ namespace HPHP { /////////////////////////////////////////////////////////////////////////////// @@ -63,4 +63,4 @@ struct BitPhase : public BitPhaseImpl #include @@ -76,4 +76,4 @@ class hphp_string_iset : /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_CASE_INSENSITIVE_H__ +#endif // incl_HPHP_CASE_INSENSITIVE_H_ diff --git a/hphp/util/compact_sized_ptr.h b/hphp/util/compact_sized_ptr.h index 92a0bc27f..892635c2f 100644 --- a/hphp/util/compact_sized_ptr.h +++ b/hphp/util/compact_sized_ptr.h @@ -13,8 +13,8 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#ifndef incl_UTIL_COMPACT_SIZED_PTR_H_ -#define incl_UTIL_COMPACT_SIZED_PTR_H_ +#ifndef incl_HPHP_UTIL_COMPACT_SIZED_PTR_H_ +#define incl_HPHP_UTIL_COMPACT_SIZED_PTR_H_ /* * A combined pointer + size intended to save space on x64. The diff --git a/hphp/util/compatibility.h b/hphp/util/compatibility.h index bc720454b..239a6de8f 100644 --- a/hphp/util/compatibility.h +++ b/hphp/util/compatibility.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __COMPATIBILITY_H__ -#define __COMPATIBILITY_H__ +#ifndef incl_HPHP_COMPATIBILITY_H_ +#define incl_HPHP_COMPATIBILITY_H_ #include "base.h" @@ -35,4 +35,4 @@ int64_t gettime_diff_us(const timespec &start, const timespec &end); /////////////////////////////////////////////////////////////////////////////// } -#endif // __COMPATIBILITY_H__ +#endif // incl_HPHP_COMPATIBILITY_H_ diff --git a/hphp/util/compression.h b/hphp/util/compression.h index cc0a443f6..86c59ac36 100644 --- a/hphp/util/compression.h +++ b/hphp/util/compression.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __COMPRESSION_H__ -#define __COMPRESSION_H__ +#ifndef incl_HPHP_COMPRESSION_H_ +#define incl_HPHP_COMPRESSION_H_ #include "base.h" #include @@ -57,4 +57,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __COMPRESSION_H__ +#endif // incl_HPHP_COMPRESSION_H_ diff --git a/hphp/util/cronolog.h b/hphp/util/cronolog.h index 95305ee4a..3217b6d7c 100644 --- a/hphp/util/cronolog.h +++ b/hphp/util/cronolog.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __CRONOLOG_H__ -#define __CRONOLOG_H__ +#ifndef incl_HPHP_CRONOLOG_H_ +#define incl_HPHP_CRONOLOG_H_ #include #include @@ -77,4 +77,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __CRONOLOG_H__ +#endif // incl_HPHP_CRONOLOG_H_ diff --git a/hphp/util/dataset.h b/hphp/util/dataset.h index 1681a0c84..13ea0a17c 100644 --- a/hphp/util/dataset.h +++ b/hphp/util/dataset.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __DATASET_H__ -#define __DATASET_H__ +#ifndef incl_HPHP_DATASET_H_ +#define incl_HPHP_DATASET_H_ #include "base.h" #include @@ -84,4 +84,4 @@ class DataSet { /////////////////////////////////////////////////////////////////////////////// } -#endif // __DATASET_H__ +#endif // incl_HPHP_DATASET_H_ diff --git a/hphp/util/db_conn.h b/hphp/util/db_conn.h index 5e5bde833..001facbd0 100644 --- a/hphp/util/db_conn.h +++ b/hphp/util/db_conn.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __DB_CONN_H__ -#define __DB_CONN_H__ +#ifndef incl_HPHP_DB_CONN_H_ +#define incl_HPHP_DB_CONN_H_ #include "db_dataset.h" #include "exception.h" @@ -203,4 +203,4 @@ class DBConn { /////////////////////////////////////////////////////////////////////////////// } -#endif // __DB_CONN_H__ +#endif // incl_HPHP_DB_CONN_H_ diff --git a/hphp/util/db_dataset.h b/hphp/util/db_dataset.h index 70b69a278..6098b92aa 100644 --- a/hphp/util/db_dataset.h +++ b/hphp/util/db_dataset.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __DB_DATASET_H__ -#define __DB_DATASET_H__ +#ifndef incl_HPHP_DB_DATASET_H_ +#define incl_HPHP_DB_DATASET_H_ #include "dataset.h" @@ -74,4 +74,4 @@ class DBDataSet : public DataSet { /////////////////////////////////////////////////////////////////////////////// } -#endif // __DB_DATASET_H__ +#endif // incl_HPHP_DB_DATASET_H_ diff --git a/hphp/util/db_filter.h b/hphp/util/db_filter.h index 5006754c9..8c8c781c3 100644 --- a/hphp/util/db_filter.h +++ b/hphp/util/db_filter.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __DB_FILTER_H__ -#define __DB_FILTER_H__ +#ifndef incl_HPHP_DB_FILTER_H_ +#define incl_HPHP_DB_FILTER_H_ #include "base.h" @@ -154,4 +154,4 @@ class DBOrStringFilter : public DBQueryFilter { /////////////////////////////////////////////////////////////////////////////// } -#endif // __DB_FILTER_H__ +#endif // incl_HPHP_DB_FILTER_H_ diff --git a/hphp/util/db_mysql.h b/hphp/util/db_mysql.h index 0ea62e8f9..650a20be4 100644 --- a/hphp/util/db_mysql.h +++ b/hphp/util/db_mysql.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __DB_MYSQL_H__ -#define __DB_MYSQL_H__ +#ifndef incl_HPHP_DB_MYSQL_H_ +#define incl_HPHP_DB_MYSQL_H_ #include "base.h" #include @@ -35,4 +35,4 @@ public: /////////////////////////////////////////////////////////////////////////////// } -#endif // __DB_MYSQL_H__ +#endif // incl_HPHP_DB_MYSQL_H_ diff --git a/hphp/util/db_query.h b/hphp/util/db_query.h index 923a8df1e..376c48274 100644 --- a/hphp/util/db_query.h +++ b/hphp/util/db_query.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __DB_QUERY_H__ -#define __DB_QUERY_H__ +#ifndef incl_HPHP_DB_QUERY_H_ +#define incl_HPHP_DB_QUERY_H_ #include #include "db_filter.h" @@ -162,4 +162,4 @@ class DBQuery { /////////////////////////////////////////////////////////////////////////////// } -#endif // __DB_QUERY_H__ +#endif // incl_HPHP_DB_QUERY_H_ diff --git a/hphp/util/debug.h b/hphp/util/debug.h index bf41c0d2c..a992d22a2 100644 --- a/hphp/util/debug.h +++ b/hphp/util/debug.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef incl_DEBUG_H_ -#define incl_DEBUG_H_ +#ifndef incl_HPHP_DEBUG_H_ +#define incl_HPHP_DEBUG_H_ #include @@ -41,4 +41,4 @@ #define DEBUGGER_IF(...) do { } while(0) #endif /* DEBUG */ -#endif /* incl_DEBUG_H_ */ +#endif /* incl_HPHP_DEBUG_H_ */ diff --git a/hphp/util/disasm.h b/hphp/util/disasm.h index defa8e41b..c6356d2e1 100644 --- a/hphp/util/disasm.h +++ b/hphp/util/disasm.h @@ -13,8 +13,8 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#ifndef incl_UTIL_DISAASM_H_ -#define incl_UTIL_DISASM_H_ +#ifndef incl_HPHP_UTIL_DISAASM_H_ +#define incl_HPHP_UTIL_DISASM_H_ #ifdef HAVE_LIBXED extern "C" { diff --git a/hphp/util/exception.h b/hphp/util/exception.h index ae08156ea..4c7d073aa 100644 --- a/hphp/util/exception.h +++ b/hphp/util/exception.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __EXCEPTION_H__ -#define __EXCEPTION_H__ +#ifndef incl_HPHP_EXCEPTION_H_ +#define incl_HPHP_EXCEPTION_H_ #include "stack_trace.h" #include @@ -105,4 +105,4 @@ public: /////////////////////////////////////////////////////////////////////////////// } -#endif // __EXCEPTION_H__ +#endif // incl_HPHP_EXCEPTION_H_ diff --git a/hphp/util/exp_arena.h b/hphp/util/exp_arena.h index e08a21b2b..66ba4cfca 100644 --- a/hphp/util/exp_arena.h +++ b/hphp/util/exp_arena.h @@ -13,8 +13,8 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#ifndef incl_UTIL_EXP_ARENA_H_ -#define incl_UTIL_EXP_ARENA_H_ +#ifndef incl_HPHP_UTIL_EXP_ARENA_H_ +#define incl_HPHP_UTIL_EXP_ARENA_H_ #include #include diff --git a/hphp/util/file_cache.h b/hphp/util/file_cache.h index 2ead847f6..46d536af1 100644 --- a/hphp/util/file_cache.h +++ b/hphp/util/file_cache.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __FILE_CACHE_H__ -#define __FILE_CACHE_H__ +#ifndef incl_HPHP_FILE_CACHE_H_ +#define incl_HPHP_FILE_CACHE_H_ #include "base.h" @@ -78,4 +78,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __FILE_CACHE_H__ +#endif // incl_HPHP_FILE_CACHE_H_ diff --git a/hphp/util/fixed_vector.h b/hphp/util/fixed_vector.h index 4588fb826..c2cc61541 100644 --- a/hphp/util/fixed_vector.h +++ b/hphp/util/fixed_vector.h @@ -13,8 +13,8 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#ifndef incl_UTIL_FIXED_VECTOR_H_ -#define incl_UTIL_FIXED_VECTOR_H_ +#ifndef incl_HPHP_UTIL_FIXED_VECTOR_H_ +#define incl_HPHP_UTIL_FIXED_VECTOR_H_ #include #include diff --git a/hphp/util/hash.h b/hphp/util/hash.h index 936c17f82..cf5081ca4 100644 --- a/hphp/util/hash.h +++ b/hphp/util/hash.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_HASH_H__ -#define __HPHP_HASH_H__ +#ifndef incl_HPHP_HASH_H_ +#define incl_HPHP_HASH_H_ #include @@ -338,4 +338,4 @@ inline bool is_strictly_integer(const char* arKey, size_t nKeyLength, /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_HASH_H__ +#endif // incl_HPHP_HASH_H_ diff --git a/hphp/util/hdf.h b/hphp/util/hdf.h index 137d595c7..a41dbcc0b 100644 --- a/hphp/util/hdf.h +++ b/hphp/util/hdf.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __CONFIG_HDF_H__ -#define __CONFIG_HDF_H__ +#ifndef incl_HPHP_CONFIG_HDF_H_ +#define incl_HPHP_CONFIG_HDF_H_ #include "base.h" #include @@ -417,4 +417,4 @@ public: /////////////////////////////////////////////////////////////////////////////// } -#endif // __CONFIG_HDF_H__ +#endif // incl_HPHP_CONFIG_HDF_H_ diff --git a/hphp/util/json.h b/hphp/util/json.h index d5c5eec39..4a2440966 100644 --- a/hphp/util/json.h +++ b/hphp/util/json.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_JSON_H__ -#define __HPHP_JSON_H__ +#ifndef incl_HPHP_JSON_H_ +#define incl_HPHP_JSON_H_ #include "base.h" @@ -269,4 +269,4 @@ private: /////////////////////////////////////////////////////////////////////////////// }} -#endif // __HPHP_JSON_H__ +#endif // incl_HPHP_JSON_H_ diff --git a/hphp/util/kernel_version.h b/hphp/util/kernel_version.h index 67016b4fe..81339101c 100644 --- a/hphp/util/kernel_version.h +++ b/hphp/util/kernel_version.h @@ -13,8 +13,8 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#ifndef incl_KERNEL_VERSION_H_ -#define incl_KERNEL_VERSION_H_ +#ifndef incl_HPHP_KERNEL_VERSION_H_ +#define incl_HPHP_KERNEL_VERSION_H_ namespace HPHP { diff --git a/hphp/util/lfu_table.h b/hphp/util/lfu_table.h index dc8eb7e2e..d861277d8 100644 --- a/hphp/util/lfu_table.h +++ b/hphp/util/lfu_table.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_UTIL_LFU_TABLE_H__ -#define __HPHP_UTIL_LFU_TABLE_H__ +#ifndef incl_HPHP_UTIL_LFU_TABLE_H_ +#define incl_HPHP_UTIL_LFU_TABLE_H_ #include #include @@ -634,4 +634,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_UTIL_LFU_TABLE_H__ +#endif // incl_HPHP_UTIL_LFU_TABLE_H_ diff --git a/hphp/util/light_process.h b/hphp/util/light_process.h index 2891b8dc8..e0c626c26 100644 --- a/hphp/util/light_process.h +++ b/hphp/util/light_process.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __LIGHT_PROCESS_H__ -#define __LIGHT_PROCESS_H__ +#ifndef incl_HPHP_LIGHT_PROCESS_H_ +#define incl_HPHP_LIGHT_PROCESS_H_ #include "process.h" #include "lock.h" @@ -100,4 +100,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __LIGHT_PROCESS_H__ +#endif // incl_HPHP_LIGHT_PROCESS_H_ diff --git a/hphp/util/lock.h b/hphp/util/lock.h index 6ef3e2156..feaf1b282 100644 --- a/hphp/util/lock.h +++ b/hphp/util/lock.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __LOCK_H__ -#define __LOCK_H__ +#ifndef incl_HPHP_LOCK_H_ +#define incl_HPHP_LOCK_H_ #include "mutex.h" #include "synchronizable.h" @@ -192,4 +192,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __LOCK_H__ +#endif // incl_HPHP_LOCK_H_ diff --git a/hphp/util/logger.h b/hphp/util/logger.h index 29a40d6fa..8cf4f914a 100644 --- a/hphp/util/logger.h +++ b/hphp/util/logger.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __LOGGER_H__ -#define __LOGGER_H__ +#ifndef incl_HPHP_LOGGER_H_ +#define incl_HPHP_LOGGER_H_ #include #include @@ -165,4 +165,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __LOGGER_H__ +#endif // incl_HPHP_LOGGER_H_ diff --git a/hphp/util/min_max_macros.h b/hphp/util/min_max_macros.h index abf38a746..4a091f0d6 100644 --- a/hphp/util/min_max_macros.h +++ b/hphp/util/min_max_macros.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_MIN_MAX_MACROS__ -#define __HPHP_MIN_MAX_MACROS__ +#ifndef incl_HPHP_MIN_MAX_MACROS +#define incl_HPHP_MIN_MAX_MACROS #ifdef MIN #undef MIN @@ -27,5 +27,5 @@ #endif #define MAX(a, b) ((a)>(b)?(a):(b)) -#endif // __HPHP_MIN_MAX_MACROS__ +#endif diff --git a/hphp/util/mutex.h b/hphp/util/mutex.h index cf9299f6e..5f4e58f8c 100644 --- a/hphp/util/mutex.h +++ b/hphp/util/mutex.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __MUTEX_H__ -#define __MUTEX_H__ +#ifndef incl_HPHP_MUTEX_H_ +#define incl_HPHP_MUTEX_H_ #include #include @@ -380,4 +380,4 @@ class RankedCHM : public tbb::concurrent_hash_map { /////////////////////////////////////////////////////////////////////////////// } -#endif // __MUTEX_H__ +#endif // incl_HPHP_MUTEX_H_ diff --git a/hphp/util/neo/cs_config.h b/hphp/util/neo/cs_config.h index a9de8fdac..408d705fa 100644 --- a/hphp/util/neo/cs_config.h +++ b/hphp/util/neo/cs_config.h @@ -15,8 +15,8 @@ * config file */ -#ifndef __CS_CONFIG_H_ -#define __CS_CONFIG_H_ 1 +#ifndef incl_HPHP_CS_CONFIG_H_ +#define incl_HPHP_CS_CONFIG_H_ 1 /* Enable support for HTML Compression (still must be enabled at run time) */ @@ -221,4 +221,4 @@ /* Define to `unsigned' if does not define. */ /* #undef size_t */ -#endif /* __CS_CONFIG_H_ */ +#endif /* incl_HPHP_CS_CONFIG_H_ */ diff --git a/hphp/util/neo/neo_err.h b/hphp/util/neo/neo_err.h index f623f358e..1eddf08b6 100644 --- a/hphp/util/neo/neo_err.h +++ b/hphp/util/neo/neo_err.h @@ -9,8 +9,8 @@ * */ -#ifndef __NEO_ERR_H_ -#define __NEO_ERR_H_ 1 +#ifndef incl_HPHP_NEO_ERR_H_ +#define incl_HPHP_NEO_ERR_H_ 1 #include "neo_misc.h" @@ -225,4 +225,4 @@ int nerr_handle (NEOERR **err, NERR_TYPE type); __END_DECLS -#endif /* __NEO_ERR_H_ */ +#endif /* incl_HPHP_NEO_ERR_H_ */ diff --git a/hphp/util/neo/neo_files.h b/hphp/util/neo/neo_files.h index 203478a38..e215e1252 100644 --- a/hphp/util/neo/neo_files.h +++ b/hphp/util/neo/neo_files.h @@ -9,8 +9,8 @@ * */ -#ifndef __NEO_FILES_H_ -#define __NEO_FILES_H_ 1 +#ifndef incl_HPHP_NEO_FILES_H_ +#define incl_HPHP_NEO_FILES_H_ 1 __BEGIN_DECLS @@ -34,4 +34,4 @@ NEOERR *ne_listdir_fmatch(const char *path, ULIST **files, MATCH_FUNC fmatch, __END_DECLS -#endif /* __NEO_FILES_H_ */ +#endif /* incl_HPHP_NEO_FILES_H_ */ diff --git a/hphp/util/neo/neo_hash.h b/hphp/util/neo/neo_hash.h index 7e75136bc..60cabde1d 100644 --- a/hphp/util/neo/neo_hash.h +++ b/hphp/util/neo/neo_hash.h @@ -9,8 +9,8 @@ * */ -#ifndef __NEO_HASH_H_ -#define __NEO_HASH_H_ 1 +#ifndef incl_HPHP_NEO_HASH_H_ +#define incl_HPHP_NEO_HASH_H_ 1 __BEGIN_DECLS @@ -54,4 +54,4 @@ UINT32 ne_hash_int_hash(const void *a); __END_DECLS -#endif /* __NEO_HASH_H_ */ +#endif /* incl_HPHP_NEO_HASH_H_ */ diff --git a/hphp/util/neo/neo_hdf.h b/hphp/util/neo/neo_hdf.h index ad2a3d636..079c6afc5 100644 --- a/hphp/util/neo/neo_hdf.h +++ b/hphp/util/neo/neo_hdf.h @@ -9,8 +9,8 @@ * */ -#ifndef __NEO_HDF_H_ -#define __NEO_HDF_H_ 1 +#ifndef incl_HPHP_NEO_HDF_H_ +#define incl_HPHP_NEO_HDF_H_ 1 __BEGIN_DECLS @@ -597,4 +597,4 @@ void hdf_register_fileload(HDF *hdf, void *ctx, HDFFILELOAD fileload); __END_DECLS -#endif /* __NEO_HDF_H_ */ +#endif /* incl_HPHP_NEO_HDF_H_ */ diff --git a/hphp/util/neo/neo_misc.h b/hphp/util/neo/neo_misc.h index 5c1da07ec..94c63c0ee 100644 --- a/hphp/util/neo/neo_misc.h +++ b/hphp/util/neo/neo_misc.h @@ -9,15 +9,15 @@ * */ -#ifndef __NEO_MISC_H_ -#define __NEO_MISC_H_ 1 +#ifndef incl_HPHP_NEO_MISC_H_ +#define incl_HPHP_NEO_MISC_H_ 1 #include #include #include /* In case they didn't start from ClearSilver.h. */ -#ifndef __CS_CONFIG_H_ +#ifndef incl_HPHP_CS_CONFIG_H_ #include "cs_config.h" #endif @@ -129,4 +129,4 @@ UINT32 ne_crc (UINT8 *data, UINT32 bytes); __END_DECLS -#endif /* __NEO_MISC_H_ */ +#endif /* incl_HPHP_NEO_MISC_H_ */ diff --git a/hphp/util/neo/neo_rand.h b/hphp/util/neo/neo_rand.h index 2f962ed7c..23904d529 100644 --- a/hphp/util/neo/neo_rand.h +++ b/hphp/util/neo/neo_rand.h @@ -9,8 +9,8 @@ * */ -#ifndef __NEO_RAND_H_ -#define __NEO_RAND_H_ 1 +#ifndef incl_HPHP_NEO_RAND_H_ +#define incl_HPHP_NEO_RAND_H_ 1 __BEGIN_DECLS @@ -21,4 +21,4 @@ int neo_rand_word (char *s, int slen); __END_DECLS -#endif /* __NEO_RAND_H_ */ +#endif /* incl_HPHP_NEO_RAND_H_ */ diff --git a/hphp/util/neo/neo_str.h b/hphp/util/neo/neo_str.h index 797dd47ec..02fbc5b43 100644 --- a/hphp/util/neo/neo_str.h +++ b/hphp/util/neo/neo_str.h @@ -9,8 +9,8 @@ * */ -#ifndef __NEO_STR_H_ -#define __NEO_STR_H_ 1 +#ifndef incl_HPHP_NEO_STR_H_ +#define incl_HPHP_NEO_STR_H_ 1 __BEGIN_DECLS @@ -111,4 +111,4 @@ NEOERR *neos_url_validate (const char *in, char **esc); __END_DECLS -#endif /* __NEO_STR_H_ */ +#endif /* incl_HPHP_NEO_STR_H_ */ diff --git a/hphp/util/neo/ulist.h b/hphp/util/neo/ulist.h index ea51f9ab6..bf8250002 100644 --- a/hphp/util/neo/ulist.h +++ b/hphp/util/neo/ulist.h @@ -8,8 +8,8 @@ * Copyright (C) 2001 by Brandon Long */ -#ifndef __ULIST_H_ -#define __ULIST_H_ 1 +#ifndef incl_HPHP_ULIST_H_ +#define incl_HPHP_ULIST_H_ 1 #include "neo_err.h" @@ -42,4 +42,4 @@ int uListIndex (ULIST *ul, const void *key, int (*compareFunc)(const void *, con NEOERR * uListDestroy (ULIST **ul, int flags); NEOERR * uListDestroyFunc (ULIST **ul, void (*destroyFunc)(void *)); -#endif /* __ULIST_H_ */ +#endif /* incl_HPHP_ULIST_H_ */ diff --git a/hphp/util/neo/ulocks.h b/hphp/util/neo/ulocks.h index 8b3bfb119..94b323292 100644 --- a/hphp/util/neo/ulocks.h +++ b/hphp/util/neo/ulocks.h @@ -14,8 +14,8 @@ * */ -#ifndef __ULOCKS_H_ -#define __ULOCKS_H_ +#ifndef incl_HPHP_ULOCKS_H_ +#define incl_HPHP_ULOCKS_H_ NEOERR *fCreate(int *plock, const char *file); @@ -188,4 +188,4 @@ NEOERR *cSignal(pthread_cond_t *cond); #endif /* HAVE_PTHREAD */ -#endif /* __ULOCKS_H_ */ +#endif /* incl_HPHP_ULOCKS_H_ */ diff --git a/hphp/util/neo/wildmat.h b/hphp/util/neo/wildmat.h index 7cd316dc1..3109accad 100644 --- a/hphp/util/neo/wildmat.h +++ b/hphp/util/neo/wildmat.h @@ -3,8 +3,8 @@ * */ -#ifndef __WILDMAT_H_ -#define __WILDMAT_H_ 1 +#ifndef incl_HPHP_WILDMAT_H_ +#define incl_HPHP_WILDMAT_H_ 1 __BEGIN_DECLS @@ -13,4 +13,4 @@ int wildmatcase(const char *text, const char *p); __END_DECLS -#endif /* __WILDMAT_H_ */ +#endif /* incl_HPHP_WILDMAT_H_ */ diff --git a/hphp/util/network.h b/hphp/util/network.h index 3d876c8db..889398538 100644 --- a/hphp/util/network.h +++ b/hphp/util/network.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __NETWORK_H__ -#define __NETWORK_H__ +#ifndef incl_HPHP_NETWORK_H_ +#define incl_HPHP_NETWORK_H_ #include "base.h" #include @@ -57,4 +57,4 @@ bool GetNetworkStats(const char *iface, int &in_bps, int &out_bps); /////////////////////////////////////////////////////////////////////////////// }} -#endif // __NETWORK_H__ +#endif // incl_HPHP_NETWORK_H_ diff --git a/hphp/util/parser/location.h b/hphp/util/parser/location.h index 159315428..a549d9257 100644 --- a/hphp/util/parser/location.h +++ b/hphp/util/parser/location.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_UTIL_PARSER_LOCATION_H__ -#define __HPHP_UTIL_PARSER_LOCATION_H__ +#ifndef incl_HPHP_UTIL_PARSER_LOCATION_H_ +#define incl_HPHP_UTIL_PARSER_LOCATION_H_ #include @@ -63,4 +63,4 @@ public: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_UTIL_PARSER_LOCATION_H__ +#endif // incl_HPHP_UTIL_PARSER_LOCATION_H_ diff --git a/hphp/util/parser/parser.h b/hphp/util/parser/parser.h index 7f6c481f2..4318e1e54 100644 --- a/hphp/util/parser/parser.h +++ b/hphp/util/parser/parser.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_UTIL_PARSER_PARSER_H__ -#define __HPHP_UTIL_PARSER_PARSER_H__ +#ifndef incl_HPHP_UTIL_PARSER_PARSER_H_ +#define incl_HPHP_UTIL_PARSER_PARSER_H_ #include #include @@ -212,4 +212,4 @@ protected: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_UTIL_PARSER_PARSER_H__ +#endif // incl_HPHP_UTIL_PARSER_PARSER_H_ diff --git a/hphp/util/parser/scanner.h b/hphp/util/parser/scanner.h index 92ec994b2..87f2b383a 100644 --- a/hphp/util/parser/scanner.h +++ b/hphp/util/parser/scanner.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_UTIL_PARSER_SCANNER_H__ -#define __HPHP_UTIL_PARSER_SCANNER_H__ +#ifndef incl_HPHP_UTIL_PARSER_SCANNER_H_ +#define incl_HPHP_UTIL_PARSER_SCANNER_H_ #include #include @@ -342,4 +342,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_UTIL_PARSER_SCANNER_H__ +#endif // incl_HPHP_UTIL_PARSER_SCANNER_H_ diff --git a/hphp/util/pointer_list.h b/hphp/util/pointer_list.h index 097dc0fd7..ab5e26d51 100644 --- a/hphp/util/pointer_list.h +++ b/hphp/util/pointer_list.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __POINTERLIST_H__ -#define __POINTERLIST_H__ +#ifndef incl_HPHP_POINTERLIST_H_ +#define incl_HPHP_POINTERLIST_H_ #include #include "util/assertions.h" diff --git a/hphp/util/pool.h b/hphp/util/pool.h index 81355447d..1ae9f527c 100644 --- a/hphp/util/pool.h +++ b/hphp/util/pool.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_POOL_H__ -#define __HPHP_POOL_H__ +#ifndef incl_HPHP_POOL_H_ +#define incl_HPHP_POOL_H_ #include @@ -52,4 +52,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HPHP_POOL_H__ +#endif // incl_HPHP_POOL_H_ diff --git a/hphp/util/process.h b/hphp/util/process.h index b078e9b79..c54424e29 100644 --- a/hphp/util/process.h +++ b/hphp/util/process.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __PROCESS_H__ -#define __PROCESS_H__ +#ifndef incl_HPHP_PROCESS_H_ +#define incl_HPHP_PROCESS_H_ #include "base.h" #include @@ -200,4 +200,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __PROCESS_H__ +#endif // incl_HPHP_PROCESS_H_ diff --git a/hphp/util/rank.h b/hphp/util/rank.h index 0ff6aaf0b..3efd74c7c 100644 --- a/hphp/util/rank.h +++ b/hphp/util/rank.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef incl_RANK_H_ -#define incl_RANK_H_ +#ifndef incl_HPHP_RANK_H_ +#define incl_HPHP_RANK_H_ #include diff --git a/hphp/util/read_only_arena.h b/hphp/util/read_only_arena.h index bf0fb7d84..a505ee753 100644 --- a/hphp/util/read_only_arena.h +++ b/hphp/util/read_only_arena.h @@ -13,8 +13,8 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#ifndef incl_READ_ONLY_ARENA_H_ -#define incl_READ_ONLY_ARENA_H_ +#ifndef incl_HPHP_READ_ONLY_ARENA_H_ +#define incl_HPHP_READ_ONLY_ARENA_H_ #include #include diff --git a/hphp/util/safesort.h b/hphp/util/safesort.h index a68cb1a58..a3b68c72a 100644 --- a/hphp/util/safesort.h +++ b/hphp/util/safesort.h @@ -102,8 +102,8 @@ * of the input. */ -#ifndef incl_SAFESORT_H_ -#define incl_SAFESORT_H_ +#ifndef incl_HPHP_SAFESORT_H_ +#define incl_HPHP_SAFESORT_H_ #include @@ -339,5 +339,5 @@ void sort(IterT first, IterT last, CompT comp) { } } -#endif // incl_SAFESORT_H_ +#endif // incl_HPHP_SAFESORT_H_ diff --git a/hphp/util/shared_memory_allocator.h b/hphp/util/shared_memory_allocator.h index 64815cb74..6a7077704 100644 --- a/hphp/util/shared_memory_allocator.h +++ b/hphp/util/shared_memory_allocator.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __MEMORY_SHARED_MEMORY_ALLOCATOR_H__ -#define __MEMORY_SHARED_MEMORY_ALLOCATOR_H__ +#ifndef incl_HPHP_MEMORY_SHARED_MEMORY_ALLOCATOR_H_ +#define incl_HPHP_MEMORY_SHARED_MEMORY_ALLOCATOR_H_ #include #include @@ -239,4 +239,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __MEMORY_SHARED_MEMORY_ALLOCATOR_H__ +#endif // incl_HPHP_MEMORY_SHARED_MEMORY_ALLOCATOR_H_ diff --git a/hphp/util/shm_counter.h b/hphp/util/shm_counter.h index 6031f01fb..0fde23d2b 100644 --- a/hphp/util/shm_counter.h +++ b/hphp/util/shm_counter.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __SHM_COUNTER_H__ -#define __SHM_COUNTER_H__ +#ifndef incl_HPHP_SHM_COUNTER_H_ +#define incl_HPHP_SHM_COUNTER_H_ #include @@ -73,4 +73,4 @@ public: /////////////////////////////////////////////////////////////////////////////// } -#endif // __SHM_COUNTER_H__ +#endif // incl_HPHP_SHM_COUNTER_H_ diff --git a/hphp/util/smalllocks.h b/hphp/util/smalllocks.h index 9e7f4672b..a550f48bc 100644 --- a/hphp/util/smalllocks.h +++ b/hphp/util/smalllocks.h @@ -13,8 +13,8 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#ifndef __SMALLLOCKS_H__ -#define __SMALLLOCKS_H__ +#ifndef incl_HPHP_SMALLLOCKS_H_ +#define incl_HPHP_SMALLLOCKS_H_ #include #include diff --git a/hphp/util/ssl_init.h b/hphp/util/ssl_init.h index 52aa052f1..6899524a4 100644 --- a/hphp/util/ssl_init.h +++ b/hphp/util/ssl_init.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HTTP_SSL_INIT_H__ -#define __HTTP_SSL_INIT_H__ +#ifndef incl_HPHP_HTTP_SSL_INIT_H_ +#define incl_HPHP_HTTP_SSL_INIT_H_ namespace HPHP { /////////////////////////////////////////////////////////////////////////////// @@ -29,4 +29,4 @@ public: /////////////////////////////////////////////////////////////////////////////// } -#endif // __HTTP_SSL_INIT_H__ +#endif // incl_HPHP_HTTP_SSL_INIT_H_ diff --git a/hphp/util/stack_trace.h b/hphp/util/stack_trace.h index e38eb6b14..d332f17ee 100644 --- a/hphp/util/stack_trace.h +++ b/hphp/util/stack_trace.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __STACKTRACE_H__ -#define __STACKTRACE_H__ +#ifndef incl_HPHP_STACKTRACE_H_ +#define incl_HPHP_STACKTRACE_H_ #include #include "base.h" @@ -188,4 +188,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __STACKTRACE_H__ +#endif // incl_HPHP_STACKTRACE_H_ diff --git a/hphp/util/string_bag.h b/hphp/util/string_bag.h index b80e5921c..2c5c61d64 100644 --- a/hphp/util/string_bag.h +++ b/hphp/util/string_bag.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __STRING_BAG_H__ -#define __STRING_BAG_H__ +#ifndef incl_HPHP_STRING_BAG_H_ +#define incl_HPHP_STRING_BAG_H_ #include "base.h" @@ -42,4 +42,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __STRING_BAG_H__ +#endif // incl_HPHP_STRING_BAG_H_ diff --git a/hphp/util/synchronizable.h b/hphp/util/synchronizable.h index f233c3d8c..63d21fab5 100644 --- a/hphp/util/synchronizable.h +++ b/hphp/util/synchronizable.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __SYNCHRONIZABLE_H__ -#define __SYNCHRONIZABLE_H__ +#ifndef incl_HPHP_SYNCHRONIZABLE_H_ +#define incl_HPHP_SYNCHRONIZABLE_H_ #include "mutex.h" #include @@ -48,4 +48,4 @@ class Synchronizable { /////////////////////////////////////////////////////////////////////////////// } -#endif // __SYNCHRONIZABLE_H__ +#endif // incl_HPHP_SYNCHRONIZABLE_H_ diff --git a/hphp/util/synchronizable_multi.h b/hphp/util/synchronizable_multi.h index f33129474..1cd74542c 100644 --- a/hphp/util/synchronizable_multi.h +++ b/hphp/util/synchronizable_multi.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __SYNCHRONIZABLE_MULTI_H__ -#define __SYNCHRONIZABLE_MULTI_H__ +#ifndef incl_HPHP_SYNCHRONIZABLE_MULTI_H_ +#define incl_HPHP_SYNCHRONIZABLE_MULTI_H_ #include "base.h" #include "mutex.h" @@ -67,4 +67,4 @@ public: /////////////////////////////////////////////////////////////////////////////// } -#endif // __SYNCHRONIZABLE_MULTI_H__ +#endif // incl_HPHP_SYNCHRONIZABLE_MULTI_H_ diff --git a/hphp/util/text_art.h b/hphp/util/text_art.h index ae0acba52..ce62f28a9 100644 --- a/hphp/util/text_art.h +++ b/hphp/util/text_art.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __UTIL_TEXT_ART_H__ -#define __UTIL_TEXT_ART_H__ +#ifndef incl_HPHP_UTIL_TEXT_ART_H_ +#define incl_HPHP_UTIL_TEXT_ART_H_ #include "base.h" @@ -49,4 +49,4 @@ extern bool s_use_utf8; /////////////////////////////////////////////////////////////////////////////// }}} -#endif // __UTIL_TEXT_ART_H__ +#endif // incl_HPHP_UTIL_TEXT_ART_H_ diff --git a/hphp/util/text_color.h b/hphp/util/text_color.h index c8ac42cc5..8485e2da8 100644 --- a/hphp/util/text_color.h +++ b/hphp/util/text_color.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef incl_UTIL_TEXT_COLOR_H_ -#define incl_UTIL_TEXT_COLOR_H_ +#ifndef incl_HPHP_UTIL_TEXT_COLOR_H_ +#define incl_HPHP_UTIL_TEXT_COLOR_H_ #include "base.h" diff --git a/hphp/util/thread_local.h b/hphp/util/thread_local.h index ba2e8029d..c6dd9c6ef 100644 --- a/hphp/util/thread_local.h +++ b/hphp/util/thread_local.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __THREAD_LOCAL_H__ -#define __THREAD_LOCAL_H__ +#ifndef incl_HPHP_THREAD_LOCAL_H_ +#define incl_HPHP_THREAD_LOCAL_H_ #include #include "exception.h" @@ -562,4 +562,4 @@ public: /////////////////////////////////////////////////////////////////////////////// } -#endif // __THREAD_LOCAL_H__ +#endif // incl_HPHP_THREAD_LOCAL_H_ diff --git a/hphp/util/timer.h b/hphp/util/timer.h index 55ae83da7..7edc1d3f3 100644 --- a/hphp/util/timer.h +++ b/hphp/util/timer.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __TIMER_H__ -#define __TIMER_H__ +#ifndef incl_HPHP_TIMER_H_ +#define incl_HPHP_TIMER_H_ #include "base.h" @@ -74,4 +74,4 @@ private: /////////////////////////////////////////////////////////////////////////////// } -#endif // __TIMER_H__ +#endif // incl_HPHP_TIMER_H_ diff --git a/hphp/util/tiny_vector.h b/hphp/util/tiny_vector.h index 21a7b715c..2409100af 100644 --- a/hphp/util/tiny_vector.h +++ b/hphp/util/tiny_vector.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef incl_UTIL_TINYVECTOR_H_ -#define incl_UTIL_TINYVECTOR_H_ +#ifndef incl_HPHP_UTIL_TINYVECTOR_H_ +#define incl_HPHP_UTIL_TINYVECTOR_H_ #include #include diff --git a/hphp/util/trace.h b/hphp/util/trace.h index dc0c2f0f1..d02a55b57 100644 --- a/hphp/util/trace.h +++ b/hphp/util/trace.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef incl_TRACE_H_ -#define incl_TRACE_H_ +#ifndef incl_HPHP_TRACE_H_ +#define incl_HPHP_TRACE_H_ #include #include @@ -260,5 +260,5 @@ inline std::string color(const char* fg, const char* bg) { ////////////////////////////////////////////////////////////////////// } // HPHP -#endif /* incl_TRACE_H_ */ +#endif /* incl_HPHP_TRACE_H_ */ diff --git a/hphp/util/vdso.h b/hphp/util/vdso.h index 32a96a696..b5ae48607 100644 --- a/hphp/util/vdso.h +++ b/hphp/util/vdso.h @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ -#ifndef __HPHP_UTIL_VDSO_H -#define __HPHP_UTIL_VDSO_H +#ifndef incl_HPHP_UTIL_VDSO_H +#define incl_HPHP_UTIL_VDSO_H #include "base.h" #include "util/util.h"