From fd94725e578f797bc331de03c99d291b306d3957 Mon Sep 17 00:00:00 2001 From: Sara Golemon Date: Mon, 24 Jun 2013 19:33:24 -0700 Subject: [PATCH] Get rid of runtime/base/hphp.h This is a vestigal limb of HPHPc which caused global_variables.cpp to way over-include by way of runtime/ext/ext.h --- hphp/hhvm/global_variables.cpp | 2 +- hphp/runtime/base/hphp.h | 35 ---------------------------------- 2 files changed, 1 insertion(+), 36 deletions(-) delete mode 100644 hphp/runtime/base/hphp.h diff --git a/hphp/hhvm/global_variables.cpp b/hphp/hhvm/global_variables.cpp index 3fbd6221b..d0422b3b1 100644 --- a/hphp/hhvm/global_variables.cpp +++ b/hphp/hhvm/global_variables.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/base/hphp.h" +#include "hphp/runtime/base/base_includes.h" namespace HPHP { diff --git a/hphp/runtime/base/hphp.h b/hphp/runtime/base/hphp.h deleted file mode 100644 index b8e4b3a3f..000000000 --- a/hphp/runtime/base/hphp.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - +----------------------------------------------------------------------+ - | HipHop for PHP | - +----------------------------------------------------------------------+ - | Copyright (c) 2010-2013 Facebook, Inc. (http://www.facebook.com) | - +----------------------------------------------------------------------+ - | This source file is subject to version 3.01 of the PHP license, | - | that is bundled with this package in the file LICENSE, and is | - | available through the world-wide-web at the following url: | - | http://www.php.net/license/3_01.txt | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ -*/ - -#ifndef incl_HPHP_CPP_BASE_HPHP_H_ -#define incl_HPHP_CPP_BASE_HPHP_H_ - -/////////////////////////////////////////////////////////////////////////////// - -/** - * This is the file that's included at top of a code generated program. - * - * Do NOT include this file in runtime/base, as this depends on a generated - * globals.h that defines GlobalVariables class. - */ - -#include "hphp/runtime/base/base_includes.h" -#include "hphp/runtime/base/program_functions.h" -#include "hphp/runtime/ext/ext.h" - -/////////////////////////////////////////////////////////////////////////////// - -#endif // incl_HPHP_CPP_BASE_HPHP_H_