summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>2007-08-30 17:34:50 +0000
committerSteve Huston <shuston@riverace.com>2007-08-30 17:34:50 +0000
commit79ae33184722d6391e09e3dec6de4032024ea827 (patch)
tree4015b56b895587c9acf292088e9bb6a341bbbdcf
parent9d9ddc4a8fe63485752d47025bf57314452d56f3 (diff)
downloadATCD-79ae33184722d6391e09e3dec6de4032024ea827.tar.gz
ChangeLogTag:Thu Aug 30 17:23:21 UTC 2007 Steve Huston <shuston@riverace.com>
-rw-r--r--ACE/ChangeLog8
-rw-r--r--ACE/bin/LabVIEW_RT/labview_test_controller/labview_test_controller.cpp6
-rw-r--r--ACE/bin/LabVIEW_RT/labview_test_controller/stdafx.cpp1
-rw-r--r--ACE/bin/LabVIEW_RT/labview_test_controller/stdafx.h9
-rw-r--r--ACE/bin/LabVIEW_RT/labview_test_controller/test.cpp2
5 files changed, 21 insertions, 5 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index eb80711c956..d28d53ee84e 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,11 @@
+Thu Aug 30 17:23:21 UTC 2007 Steve Huston <shuston@riverace.com>
+
+ * bin/LabVIEW_RT/labview_test_controller/stdafx.cpp:
+ * bin/LabVIEW_RT/labview_test_controller/stdafx.h:
+ * bin/LabVIEW_RT/labview_test_controller/test.cpp:
+ * bin/LabVIEW_RT/labview_test_controller/labview_test_controller.cpp:
+ Fixed Fuxx errors.
+
Thu Aug 30 17:05:00 UTC 2007 Steve Huston <shuston@riverace.com>
* protocols/tests/HTBP/ping/client.cpp: Reverted the addition of
diff --git a/ACE/bin/LabVIEW_RT/labview_test_controller/labview_test_controller.cpp b/ACE/bin/LabVIEW_RT/labview_test_controller/labview_test_controller.cpp
index 6d7a37755ff..f2fb8fac1fe 100644
--- a/ACE/bin/LabVIEW_RT/labview_test_controller/labview_test_controller.cpp
+++ b/ACE/bin/LabVIEW_RT/labview_test_controller/labview_test_controller.cpp
@@ -21,6 +21,10 @@
#include <Winsock2.h>
+// NULL is the documented way to check DLL handles, and this is plain
+// Windows code, not ACE, so we stick to the Microsoft way...
+// FUZZ: disable check_for_NULL
+
// TEST_FUNC is the prototype for the called test's main entrypoint. It's
// the normal C main.
typedef int (*TEST_FUNC) (int argc, char *argv[]);
@@ -39,7 +43,7 @@ static HANDLE logf = INVALID_HANDLE_VALUE;
BOOL APIENTRY DllMain( HANDLE hModule,
DWORD ul_reason_for_call,
LPVOID lpReserved
- )
+ )
{
if (ul_reason_for_call == DLL_PROCESS_ATTACH)
{
diff --git a/ACE/bin/LabVIEW_RT/labview_test_controller/stdafx.cpp b/ACE/bin/LabVIEW_RT/labview_test_controller/stdafx.cpp
index 4e7bcc7060b..2c613e15662 100644
--- a/ACE/bin/LabVIEW_RT/labview_test_controller/stdafx.cpp
+++ b/ACE/bin/LabVIEW_RT/labview_test_controller/stdafx.cpp
@@ -1,3 +1,4 @@
+// $Id$
// stdafx.cpp : source file that includes just the standard includes
// labview_test_controller.pch will be the pre-compiled header
// stdafx.obj will contain the pre-compiled type information
diff --git a/ACE/bin/LabVIEW_RT/labview_test_controller/stdafx.h b/ACE/bin/LabVIEW_RT/labview_test_controller/stdafx.h
index f45cbcda25d..8b9e996b7c0 100644
--- a/ACE/bin/LabVIEW_RT/labview_test_controller/stdafx.h
+++ b/ACE/bin/LabVIEW_RT/labview_test_controller/stdafx.h
@@ -1,12 +1,13 @@
-// stdafx.h : include file for standard system include files,
-// or project specific include files that are used frequently, but
-// are changed infrequently
+// $Id$
+// stdafx.h : include file for standard system include files, or
+// project specific include files that are used frequently, but are
+// changed infrequently
//
#pragma once
-#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
+#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
// Windows Header Files:
#include <windows.h>
diff --git a/ACE/bin/LabVIEW_RT/labview_test_controller/test.cpp b/ACE/bin/LabVIEW_RT/labview_test_controller/test.cpp
index 1b571f4034c..7a9e98c964e 100644
--- a/ACE/bin/LabVIEW_RT/labview_test_controller/test.cpp
+++ b/ACE/bin/LabVIEW_RT/labview_test_controller/test.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
#include <stdio.h>
__declspec(dllimport) int test_entry(void);