From: <ro...@us...> - 2008-08-21 12:59:58
|
Revision: 1957 http://nscldaq.svn.sourceforge.net/nscldaq/?rev=1957&view=rev Author: ron-fox Date: 2008-08-21 13:00:07 +0000 (Thu, 21 Aug 2008) Log Message: ----------- Needed to include <stdint.h> in BufdumpMain.h Modified Paths: -------------- trunk/nextgen/base/CopyrightTools/test trunk/nextgen/servers/portmanager/cpptest trunk/nextgen/usb/vmusb/deviceDriver/CVMUSBDeviceDriver.cpp trunk/nextgen/utilities/bufdump/BufdumpMain.h Modified: trunk/nextgen/servers/portmanager/cpptest =================================================================== --- trunk/nextgen/servers/portmanager/cpptest 2008-08-20 19:18:45 UTC (rev 1956) +++ trunk/nextgen/servers/portmanager/cpptest 2008-08-21 13:00:07 UTC (rev 1957) @@ -18,7 +18,7 @@ # if CDPATH is set. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH -relink_command="(cd /scratch/nextgen/servers/portmanager; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; { test -z \"\${LD_LIBRARY_PATH+set}\" || unset LD_LIBRARY_PATH || { LD_LIBRARY_PATH=; export LD_LIBRARY_PATH; }; }; PATH=\"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11:/usr/bin/mh:/usr/sbin/:/sbin:/usr/bin/mh:/usr/sbin/:/sbin\"; export PATH; g++ -g -O2 -o \$progdir/\$file cpptest.o -L/scratch/nextgen/servers/portmanager /scratch/nextgen/servers/portmanager/.libs/libPortManager.so -L/scratch/nextgen/base/exception /scratch/nextgen/base/exception/.libs/libException.so -lpub /usr/lib/libcppunit.so -lX11 -Wl,--rpath -Wl,/scratch/nextgen/servers/portmanager/.libs -Wl,--rpath -Wl,/scratch/nextgen/base/exception/.libs -Wl,--rpath -Wl,/usr/opt/daq/10.0/lib)" +relink_command="(cd /scratch/nextgen/servers/portmanager; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; { test -z \"\${LD_LIBRARY_PATH+set}\" || unset LD_LIBRARY_PATH || { LD_LIBRARY_PATH=; export LD_LIBRARY_PATH; }; }; PATH=\"/opt/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11:/root/bin:/usr/bin/mh:/usr/sbin/:/sbin\"; export PATH; g++ -g -O2 -o \$progdir/\$file cpptest.o -L/scratch/nextgen/servers/portmanager /scratch/nextgen/servers/portmanager/.libs/libPortManager.so -L/scratch/nextgen/base/exception /scratch/nextgen/base/exception/.libs/libException.so -lpub /usr/lib/libcppunit.so -lX11 -Wl,--rpath -Wl,/scratch/nextgen/servers/portmanager/.libs -Wl,--rpath -Wl,/scratch/nextgen/base/exception/.libs -Wl,--rpath -Wl,/usr/opt/daq/10.0/lib)" # This environment variable determines our operation mode. if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then Modified: trunk/nextgen/usb/vmusb/deviceDriver/CVMUSBDeviceDriver.cpp =================================================================== --- trunk/nextgen/usb/vmusb/deviceDriver/CVMUSBDeviceDriver.cpp 2008-08-20 19:18:45 UTC (rev 1956) +++ trunk/nextgen/usb/vmusb/deviceDriver/CVMUSBDeviceDriver.cpp 2008-08-21 13:00:07 UTC (rev 1957) @@ -169,7 +169,7 @@ CVMUSBDeviceDriver::usbStopAutonomous() { m_pInterface->writeActionRegister(CVMUSB::ActionRegister::scalerDump); - m_pInterface->writeActionRegister(0); + } /*! Modified: trunk/nextgen/utilities/bufdump/BufdumpMain.h =================================================================== --- trunk/nextgen/utilities/bufdump/BufdumpMain.h 2008-08-20 19:18:45 UTC (rev 1956) +++ trunk/nextgen/utilities/bufdump/BufdumpMain.h 2008-08-21 13:00:07 UTC (rev 1957) @@ -37,7 +37,14 @@ #endif #endif +#ifndef __CRT_STDINT_H +#include <stdint.h> +#ifndef __CRT_STDINT_H +#define __CRT_STDINT_H +#endif +#endif + // Forward definitiosn: class URL; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |