X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCockpit%2Fpanel_io.hxx;h=5d5fd09fbc550a7b7e6572b293aaf79147450942;hb=5889a7148b492411430a7f3a76ae7847e0096ff7;hp=8c38f8d99cae914c07235ffa6ddfce512840d716;hpb=cf7839a67b3f41a1b788902edce03fb9ede0b7a7;p=flightgear.git diff --git a/src/Cockpit/panel_io.hxx b/src/Cockpit/panel_io.hxx index 8c38f8d99..5d5fd09fb 100644 --- a/src/Cockpit/panel_io.hxx +++ b/src/Cockpit/panel_io.hxx @@ -11,10 +11,10 @@ // WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // General Public License for more details. -// +// // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software -// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. // // $Id$ @@ -25,19 +25,14 @@ # include #endif -#ifdef HAVE_WINDOWS_H -# include -#endif - #include -#include STL_IOSTREAM - -SG_USING_STD(istream); +#include +#include class FGPanel; -extern FGPanel * fgReadPanel (istream &input); -extern FGPanel * fgReadPanel (const string &relative_path); +extern FGPanel * fgReadPanel (std::istream &input); +extern FGPanel * fgReadPanel (const std::string &relative_path); #endif // __PANEL_IO_HXX