X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FNetwork%2Fnative.cxx;h=0057040537e30b8450a46e80afc373b3fc60efc5;hb=dc76290d6e7d2f24d6c352d8f9da4b0f9f1e5f40;hp=c2e94190e42e0bb5185188f42997f8bc085054cf;hpb=182fd42b4017fa54d680508c092ea1b216398a00;p=flightgear.git diff --git a/src/Network/native.cxx b/src/Network/native.cxx index c2e94190e..005704053 100644 --- a/src/Network/native.cxx +++ b/src/Network/native.cxx @@ -2,7 +2,7 @@ // // Written by Curtis Olson, started November 1999. // -// Copyright (C) 1999 Curtis L. Olson - curt@flightgear.org +// Copyright (C) 1999 Curtis L. Olson - http://www.flightgear.org/~curt // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License as @@ -16,16 +16,20 @@ // // 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$ +#ifdef HAVE_CONFIG_H +# include +#endif #include #include #include "native.hxx" +#include FGNative::FGNative() { } @@ -54,15 +58,21 @@ bool FGNative::open() { return true; } +/** + * The design of FGNative requires direct, memcpy access to FGInterface, + * unfortunately. Since this is the only remaining place that does, the + * extern lives here, rather than a header file. + * + */ +extern FGInterface* evil_global_fdm_state; // process work for this port bool FGNative::process() { SGIOChannel *io = get_io_channel(); - int length = sizeof(*cur_fdm_state); + int length = sizeof(FGInterface); if ( get_direction() == SG_IO_OUT ) { - // cout << "size of cur_fdm_state = " << length << endl; - buf = *cur_fdm_state; + buf = *evil_global_fdm_state; if ( ! io->write( (char *)(& buf), length ) ) { SG_LOG( SG_IO, SG_ALERT, "Error writing data." ); return false; @@ -71,12 +81,12 @@ bool FGNative::process() { if ( io->get_type() == sgFileType ) { if ( io->read( (char *)(& buf), length ) == length ) { SG_LOG( SG_IO, SG_DEBUG, "Success reading data." ); - *cur_fdm_state = buf; + *evil_global_fdm_state = buf; } } else { while ( io->read( (char *)(& buf), length ) == length ) { SG_LOG( SG_IO, SG_DEBUG, "Success reading data." ); - *cur_fdm_state = buf; + *evil_global_fdm_state = buf; } } }