diff options
Diffstat (limited to 'apps')
34 files changed, 1388 insertions, 262 deletions
diff --git a/apps/FaCE/FaCE.vcp b/apps/FaCE/FaCE.vcp new file mode 100644 index 00000000000..1dcf8c5fe60 --- /dev/null +++ b/apps/FaCE/FaCE.vcp @@ -0,0 +1,604 @@ +# Microsoft eMbedded Visual Tools Project File - Name="FaCE" - Package Owner=<4>
+# Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (WCE x86) Application" 0x8301
+# TARGTYPE "Win32 (WCE ARM) Application" 0x8501
+
+CFG=FaCE - Win32 (WCE ARM) Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "FaCE.vcn".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "FaCE.vcn" CFG="FaCE - Win32 (WCE ARM) Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "FaCE - Win32 (WCE ARM) Release" (based on "Win32 (WCE ARM) Application")
+!MESSAGE "FaCE - Win32 (WCE ARM) Debug" (based on "Win32 (WCE ARM) Application")
+!MESSAGE "FaCE - Win32 (WCE x86) Release" (based on "Win32 (WCE x86) Application")
+!MESSAGE "FaCE - Win32 (WCE x86) Debug" (based on "Win32 (WCE x86) Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+# PROP ATL_Project 2
+
+!IF "$(CFG)" == "FaCE - Win32 (WCE ARM) Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "ARMRel"
+# PROP BASE Intermediate_Dir "ARMRel"
+# PROP BASE CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}"
+# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "ARMRel"
+# PROP Intermediate_Dir "ARMRel"
+# PROP CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}"
+# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
+CPP=clarm.exe
+# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /Yu"stdafx.h" /Oxs /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /I "$(ACE_ROOT)" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /Oxs /M$(CECrtMT) /c
+# SUBTRACT CPP /YX /Yc /Yu
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
+# ADD LINK32 commctrl.lib coredll.lib aygshell.lib ace_os.lib ace.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /libpath:"$(ACE_ROOT)\LIB\Release\ARM" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
+
+!ELSEIF "$(CFG)" == "FaCE - Win32 (WCE ARM) Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "ARMDbg"
+# PROP BASE Intermediate_Dir "ARMDbg"
+# PROP BASE CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}"
+# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "ARMDbg"
+# PROP Intermediate_Dir "ARMDbg"
+# PROP CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}"
+# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
+CPP=clarm.exe
+# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /Yu"stdafx.h" /M$(CECrtMTDebug) /c
+# ADD CPP /nologo /W3 /Zi /Od /I "$(ACE_ROOT)" /D "DEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /M$(CECrtMTDebug) /c
+# SUBTRACT CPP /YX /Yc /Yu
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
+# ADD LINK32 commctrl.lib coredll.lib aygshell.lib ace_osd.lib aced.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /libpath:"$(ACE_ROOT)\LIB\Debug\ARM" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
+
+!ELSEIF "$(CFG)" == "FaCE - Win32 (WCE x86) Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "X86Rel"
+# PROP BASE Intermediate_Dir "X86Rel"
+# PROP BASE CPU_ID "{D6518FF3-710F-11D3-99F2-00105A0DF099}"
+# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "X86Rel"
+# PROP Intermediate_Dir "X86Rel"
+# PROP CPU_ID "{D6518FF3-710F-11D3-99F2-00105A0DF099}"
+# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r
+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /Yu"stdafx.h" /Gs8192 /GF /Oxs /c
+# ADD CPP /nologo /W3 /I "$(ACE_ROOT)" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /Gs8192 /GF /Oxs /c
+# SUBTRACT CPP /YX /Yc /Yu
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /subsystem:$(CESubsystem) /MACHINE:IX86
+# ADD LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) aygshell.lib ace_os.lib ace.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /subsystem:$(CESubsystem) /MACHINE:IX86
+
+!ELSEIF "$(CFG)" == "FaCE - Win32 (WCE x86) Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "X86Dbg"
+# PROP BASE Intermediate_Dir "X86Dbg"
+# PROP BASE CPU_ID "{D6518FF3-710F-11D3-99F2-00105A0DF099}"
+# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "X86Dbg"
+# PROP Intermediate_Dir "X86Dbg"
+# PROP CPU_ID "{D6518FF3-710F-11D3-99F2-00105A0DF099}"
+# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r
+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "_i386_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /Yu"stdafx.h" /Gs8192 /GF /c
+# ADD CPP /nologo /W3 /Zi /Od /I "$(ACE_ROOT)" /D "DEBUG" /D "_i386_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /Gs8192 /GF /c
+# SUBTRACT CPP /YX /Yc /Yu
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /subsystem:$(CESubsystem) /MACHINE:IX86
+# ADD LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) aygshell.lib ace_osd.lib aced.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /libpath:"$(ACE_ROOT)\LIB\Debug\X86EM" /subsystem:$(CESubsystem) /MACHINE:IX86
+
+!ENDIF
+
+# Begin Target
+
+# Name "FaCE - Win32 (WCE ARM) Release"
+# Name "FaCE - Win32 (WCE ARM) Debug"
+# Name "FaCE - Win32 (WCE x86) Release"
+# Name "FaCE - Win32 (WCE x86) Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\FaCE.cpp
+
+!IF "$(CFG)" == "FaCE - Win32 (WCE ARM) Release"
+
+DEP_CPP_FACE_=\
+ ".\FaCE.h"\
+
+NODEP_CPP_FACE_=\
+ ".\ipapi.h"\
+ ".\StdAfx.h"\
+ ".\ygshell.h"\
+
+
+!ELSEIF "$(CFG)" == "FaCE - Win32 (WCE ARM) Debug"
+
+DEP_CPP_FACE_=\
+ ".\FaCE.h"\
+
+NODEP_CPP_FACE_=\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\ace.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\ACE.i"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\ACE_export.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\ace_wchar.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\ace_wchar.inl"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Base_Thread_Adapter.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Base_Thread_Adapter.inl"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Basic_Types.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Basic_Types.i"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\CE_Screen_Output.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-all.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-cygwin32-common.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-cygwin32.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-g++-common.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-ghs-common.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-borland.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-common.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-ghs.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-mingw.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-msvc-5.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-msvc-6.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-msvc-7.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-msvc.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-visualage.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-WinCE.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Flag_Manip.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Flag_Manip.i"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Handle_Ops.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Handle_Ops.i"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Init_ACE.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Init_ACE.i"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\iosfwd.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Lib_Find.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Lib_Find.i"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Log_Msg.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Log_Msg_Callback.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Log_Priority.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Log_Record.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Log_Record.i"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Managed_Object.cpp"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Managed_Object.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Managed_Object.i"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Min_Max.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Object_Manager.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Object_Manager.i"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS.i"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Dirent.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Dirent.inl"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Errno.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Errno.inl"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Export.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Log_Msg_Attributes.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Log_Msg_Attributes.inl"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Memory.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Memory.inl"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS_String.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS_String.inl"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS_TLI.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS_TLI.inl"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\post.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\pre.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Sock_Connect.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Sock_Connect.i"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\streams.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\svc_export.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Adapter.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Adapter.inl"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Control.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Control.inl"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Exit.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Hook.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Trace.h"\
+ ".\ipapi.h"\
+ ".\StdAfx.h"\
+ ".\ygshell.h"\
+
+
+!ELSEIF "$(CFG)" == "FaCE - Win32 (WCE x86) Release"
+
+DEP_CPP_FACE_=\
+ ".\FaCE.h"\
+
+NODEP_CPP_FACE_=\
+ ".\ipapi.h"\
+ ".\StdAfx.h"\
+ ".\ygshell.h"\
+
+
+!ELSEIF "$(CFG)" == "FaCE - Win32 (WCE x86) Debug"
+
+DEP_CPP_FACE_=\
+ "..\..\ace\ace.h"\
+ "..\..\ace\ACE.i"\
+ "..\..\ace\ACE_export.h"\
+ "..\..\ace\ace_wchar.h"\
+ "..\..\ace\ace_wchar.inl"\
+ "..\..\ace\Argv_Type_Converter.h"\
+ "..\..\ace\Argv_Type_Converter.inl"\
+ "..\..\ace\Base_Thread_Adapter.h"\
+ "..\..\ace\Base_Thread_Adapter.inl"\
+ "..\..\ace\Basic_Types.h"\
+ "..\..\ace\Basic_Types.i"\
+ "..\..\ace\CE_Screen_Output.h"\
+ "..\..\ace\config-all.h"\
+ "..\..\ace\config-cygwin32-common.h"\
+ "..\..\ace\config-cygwin32.h"\
+ "..\..\ace\config-g++-common.h"\
+ "..\..\ace\config-ghs-common.h"\
+ "..\..\ace\config-win32-borland.h"\
+ "..\..\ace\config-win32-common.h"\
+ "..\..\ace\config-win32-ghs.h"\
+ "..\..\ace\config-win32-mingw.h"\
+ "..\..\ace\config-win32-msvc-5.h"\
+ "..\..\ace\config-win32-msvc-6.h"\
+ "..\..\ace\config-win32-msvc-7.h"\
+ "..\..\ace\config-win32-msvc.h"\
+ "..\..\ace\config-win32-visualage.h"\
+ "..\..\ace\config-win32.h"\
+ "..\..\ace\config-WinCE.h"\
+ "..\..\ace\config.h"\
+ "..\..\ace\Default_Constants.h"\
+ "..\..\ace\Flag_Manip.h"\
+ "..\..\ace\Flag_Manip.i"\
+ "..\..\ace\Global_Macros.h"\
+ "..\..\ace\Handle_Ops.h"\
+ "..\..\ace\Handle_Ops.i"\
+ "..\..\ace\Init_ACE.h"\
+ "..\..\ace\Init_ACE.i"\
+ "..\..\ace\iosfwd.h"\
+ "..\..\ace\Lib_Find.h"\
+ "..\..\ace\Lib_Find.i"\
+ "..\..\ace\Log_Msg.h"\
+ "..\..\ace\Log_Msg_Callback.h"\
+ "..\..\ace\Log_Priority.h"\
+ "..\..\ace\Log_Record.h"\
+ "..\..\ace\Log_Record.i"\
+ "..\..\ace\Managed_Object.cpp"\
+ "..\..\ace\Managed_Object.h"\
+ "..\..\ace\Managed_Object.i"\
+ "..\..\ace\Min_Max.h"\
+ "..\..\ace\Object_Manager.h"\
+ "..\..\ace\Object_Manager.i"\
+ "..\..\ace\OS.h"\
+ "..\..\ace\OS.i"\
+ "..\..\ace\OS_Dirent.h"\
+ "..\..\ace\OS_Dirent.inl"\
+ "..\..\ace\OS_Errno.h"\
+ "..\..\ace\OS_Errno.inl"\
+ "..\..\ace\OS_Export.h"\
+ "..\..\ace\OS_Log_Msg_Attributes.h"\
+ "..\..\ace\OS_Log_Msg_Attributes.inl"\
+ "..\..\ace\OS_Memory.h"\
+ "..\..\ace\OS_Memory.inl"\
+ "..\..\ace\OS_String.h"\
+ "..\..\ace\OS_String.inl"\
+ "..\..\ace\OS_TLI.h"\
+ "..\..\ace\OS_TLI.inl"\
+ "..\..\ace\post.h"\
+ "..\..\ace\pre.h"\
+ "..\..\ace\Sock_Connect.h"\
+ "..\..\ace\Sock_Connect.i"\
+ "..\..\ace\streams.h"\
+ "..\..\ace\svc_export.h"\
+ "..\..\ace\Thread_Adapter.h"\
+ "..\..\ace\Thread_Adapter.inl"\
+ "..\..\ace\Thread_Control.h"\
+ "..\..\ace\Thread_Control.inl"\
+ "..\..\ace\Thread_Exit.h"\
+ "..\..\ace\Thread_Hook.h"\
+ "..\..\ace\Trace.h"\
+ ".\CE_ARGV.h"\
+ ".\CE_Screen_Output.h"\
+ ".\FaCE.h"\
+ {$(INCLUDE)}"aygshell.h"\
+ {$(INCLUDE)}"sipapi.h"\
+
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\FaCE.rc
+
+!IF "$(CFG)" == "FaCE - Win32 (WCE ARM) Release"
+
+!ELSEIF "$(CFG)" == "FaCE - Win32 (WCE ARM) Debug"
+
+!ELSEIF "$(CFG)" == "FaCE - Win32 (WCE x86) Release"
+
+!ELSEIF "$(CFG)" == "FaCE - Win32 (WCE x86) Debug"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\Main.cpp
+
+!IF "$(CFG)" == "FaCE - Win32 (WCE ARM) Release"
+
+DEP_CPP_MAIN_=\
+ ".\FaCE.h"\
+
+
+!ELSEIF "$(CFG)" == "FaCE - Win32 (WCE ARM) Debug"
+
+DEP_CPP_MAIN_=\
+ ".\FaCE.h"\
+
+NODEP_CPP_MAIN_=\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\ACE_export.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\ace_wchar.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\ace_wchar.inl"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Base_Thread_Adapter.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Base_Thread_Adapter.inl"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Basic_Types.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Basic_Types.i"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-all.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-cygwin32-common.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-cygwin32.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-g++-common.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-ghs-common.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-borland.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-common.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-ghs.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-mingw.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-msvc-5.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-msvc-6.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-msvc-7.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-msvc.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-visualage.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-WinCE.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\iosfwd.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Log_Msg.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Log_Msg_Callback.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Log_Priority.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Log_Record.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Log_Record.i"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Managed_Object.cpp"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Managed_Object.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Managed_Object.i"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Min_Max.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Object_Manager.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Object_Manager.i"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS.i"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Dirent.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Dirent.inl"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Errno.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Errno.inl"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Export.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Log_Msg_Attributes.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Log_Msg_Attributes.inl"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Memory.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Memory.inl"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS_String.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS_String.inl"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS_TLI.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS_TLI.inl"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\post.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\pre.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\streams.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\svc_export.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Adapter.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Adapter.inl"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Control.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Control.inl"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Exit.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Hook.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Trace.h"\
+
+
+!ELSEIF "$(CFG)" == "FaCE - Win32 (WCE x86) Release"
+
+DEP_CPP_MAIN_=\
+ ".\FaCE.h"\
+
+
+!ELSEIF "$(CFG)" == "FaCE - Win32 (WCE x86) Debug"
+
+DEP_CPP_MAIN_=\
+ "..\..\ace\ACE_export.h"\
+ "..\..\ace\ace_wchar.h"\
+ "..\..\ace\ace_wchar.inl"\
+ "..\..\ace\Argv_Type_Converter.h"\
+ "..\..\ace\Argv_Type_Converter.inl"\
+ "..\..\ace\Base_Thread_Adapter.h"\
+ "..\..\ace\Base_Thread_Adapter.inl"\
+ "..\..\ace\Basic_Types.h"\
+ "..\..\ace\Basic_Types.i"\
+ "..\..\ace\CE_Screen_Output.h"\
+ "..\..\ace\config-all.h"\
+ "..\..\ace\config-cygwin32-common.h"\
+ "..\..\ace\config-cygwin32.h"\
+ "..\..\ace\config-g++-common.h"\
+ "..\..\ace\config-ghs-common.h"\
+ "..\..\ace\config-win32-borland.h"\
+ "..\..\ace\config-win32-common.h"\
+ "..\..\ace\config-win32-ghs.h"\
+ "..\..\ace\config-win32-mingw.h"\
+ "..\..\ace\config-win32-msvc-5.h"\
+ "..\..\ace\config-win32-msvc-6.h"\
+ "..\..\ace\config-win32-msvc-7.h"\
+ "..\..\ace\config-win32-msvc.h"\
+ "..\..\ace\config-win32-visualage.h"\
+ "..\..\ace\config-win32.h"\
+ "..\..\ace\config-WinCE.h"\
+ "..\..\ace\config.h"\
+ "..\..\ace\Default_Constants.h"\
+ "..\..\ace\Global_Macros.h"\
+ "..\..\ace\iosfwd.h"\
+ "..\..\ace\Log_Msg.h"\
+ "..\..\ace\Log_Msg_Callback.h"\
+ "..\..\ace\Log_Priority.h"\
+ "..\..\ace\Log_Record.h"\
+ "..\..\ace\Log_Record.i"\
+ "..\..\ace\Managed_Object.cpp"\
+ "..\..\ace\Managed_Object.h"\
+ "..\..\ace\Managed_Object.i"\
+ "..\..\ace\Min_Max.h"\
+ "..\..\ace\Object_Manager.h"\
+ "..\..\ace\Object_Manager.i"\
+ "..\..\ace\OS.h"\
+ "..\..\ace\OS.i"\
+ "..\..\ace\OS_Dirent.h"\
+ "..\..\ace\OS_Dirent.inl"\
+ "..\..\ace\OS_Errno.h"\
+ "..\..\ace\OS_Errno.inl"\
+ "..\..\ace\OS_Export.h"\
+ "..\..\ace\OS_Log_Msg_Attributes.h"\
+ "..\..\ace\OS_Log_Msg_Attributes.inl"\
+ "..\..\ace\OS_Memory.h"\
+ "..\..\ace\OS_Memory.inl"\
+ "..\..\ace\OS_String.h"\
+ "..\..\ace\OS_String.inl"\
+ "..\..\ace\OS_TLI.h"\
+ "..\..\ace\OS_TLI.inl"\
+ "..\..\ace\post.h"\
+ "..\..\ace\pre.h"\
+ "..\..\ace\streams.h"\
+ "..\..\ace\svc_export.h"\
+ "..\..\ace\Thread_Adapter.h"\
+ "..\..\ace\Thread_Adapter.inl"\
+ "..\..\ace\Thread_Control.h"\
+ "..\..\ace\Thread_Control.inl"\
+ "..\..\ace\Thread_Exit.h"\
+ "..\..\ace\Thread_Hook.h"\
+ "..\..\ace\Trace.h"\
+ ".\CE_Screen_Output.h"\
+ ".\FaCE.h"\
+
+
+!ENDIF
+
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\FaCE.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\newres.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\resource.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# Begin Source File
+
+SOURCE=.\ACE_Racer.bmp
+# End Source File
+# Begin Source File
+
+SOURCE=.\FaCE.ico
+# End Source File
+# Begin Source File
+
+SOURCE=.\TAO.bmp
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=.\License.txt
+# End Source File
+# Begin Source File
+
+SOURCE=.\ReadMe.txt
+# End Source File
+# End Target
+# End Project
diff --git a/apps/FaCE/FaCE.vcw b/apps/FaCE/FaCE.vcw new file mode 100644 index 00000000000..3ef52974f61 --- /dev/null +++ b/apps/FaCE/FaCE.vcw @@ -0,0 +1,29 @@ +Microsoft eMbedded Visual Tools Workspace File, Format Version 3.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "FaCE"=".\FaCE.vcp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/apps/FaCE/FaCENOACE.vcp b/apps/FaCE/FaCENOACE.vcp new file mode 100644 index 00000000000..a6cabffe420 --- /dev/null +++ b/apps/FaCE/FaCENOACE.vcp @@ -0,0 +1,528 @@ +# Microsoft eMbedded Visual Tools Project File - Name="FaCENOACE" - Package Owner=<4>
+# Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (WCE x86) Application" 0x8301
+# TARGTYPE "Win32 (WCE ARM) Application" 0x8501
+
+CFG=FaCENOACE - Win32 (WCE ARM) Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "FaCENOACE.vcn".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "FaCENOACE.vcn" CFG="FaCENOACE - Win32 (WCE ARM) Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "FaCENOACE - Win32 (WCE ARM) Release" (based on "Win32 (WCE ARM) Application")
+!MESSAGE "FaCENOACE - Win32 (WCE ARM) Debug" (based on "Win32 (WCE ARM) Application")
+!MESSAGE "FaCENOACE - Win32 (WCE x86) Release" (based on "Win32 (WCE x86) Application")
+!MESSAGE "FaCENOACE - Win32 (WCE x86) Debug" (based on "Win32 (WCE x86) Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+# PROP ATL_Project 2
+
+!IF "$(CFG)" == "FaCENOACE - Win32 (WCE ARM) Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "ARMRel"
+# PROP BASE Intermediate_Dir "ARMRel"
+# PROP BASE CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}"
+# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "ARMRelNOACE"
+# PROP Intermediate_Dir "ARMRelNOACE"
+# PROP CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}"
+# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
+CPP=clarm.exe
+# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /Yu"stdafx.h" /Oxs /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /D "ARM" /D "_ARM_" /D "NDEBUG" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "NO_ACE" /Oxs /M$(CECrtMT) /c
+# SUBTRACT CPP /YX /Yc /Yu
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
+# ADD LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
+
+!ELSEIF "$(CFG)" == "FaCENOACE - Win32 (WCE ARM) Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "ARMDbg"
+# PROP BASE Intermediate_Dir "ARMDbg"
+# PROP BASE CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}"
+# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "ARMDbgNOACE"
+# PROP Intermediate_Dir "ARMDbgNOACE"
+# PROP CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}"
+# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r
+CPP=clarm.exe
+# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /Yu"stdafx.h" /M$(CECrtMTDebug) /c
+# ADD CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "NO_ACE" /M$(CECrtMTDebug) /c
+# SUBTRACT CPP /YX /Yc /Yu
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
+# ADD LINK32 commctrl.lib coredll.lib aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM
+
+!ELSEIF "$(CFG)" == "FaCENOACE - Win32 (WCE x86) Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "X86Rel"
+# PROP BASE Intermediate_Dir "X86Rel"
+# PROP BASE CPU_ID "{D6518FF3-710F-11D3-99F2-00105A0DF099}"
+# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "X86RelNOACE"
+# PROP Intermediate_Dir "X86RelNOACE"
+# PROP CPU_ID "{D6518FF3-710F-11D3-99F2-00105A0DF099}"
+# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r
+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /Yu"stdafx.h" /Gs8192 /GF /Oxs /c
+# ADD CPP /nologo /W3 /D "_i386_" /D "i_386_" /D "_X86_" /D "x86" /D "NDEBUG" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "NO_ACE" /Gs8192 /GF /Oxs /c
+# SUBTRACT CPP /YX /Yc /Yu
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /subsystem:$(CESubsystem) /MACHINE:IX86
+# ADD LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /subsystem:$(CESubsystem) /MACHINE:IX86
+
+!ELSEIF "$(CFG)" == "FaCENOACE - Win32 (WCE x86) Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "X86Dbg"
+# PROP BASE Intermediate_Dir "X86Dbg"
+# PROP BASE CPU_ID "{D6518FF3-710F-11D3-99F2-00105A0DF099}"
+# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "X86DbgNOACE"
+# PROP Intermediate_Dir "X86DbgNOACE"
+# PROP CPU_ID "{D6518FF3-710F-11D3-99F2-00105A0DF099}"
+# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r
+# ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "_i386_" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "i_386_" /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /Yu"stdafx.h" /Gs8192 /GF /c
+# ADD CPP /nologo /W3 /Zi /Od /D "DEBUG" /D "_i386_" /D "i_386_" /D "_X86_" /D "x86" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "UNICODE" /D "_UNICODE" /D "NO_ACE" /Gs8192 /GF /c
+# SUBTRACT CPP /YX /Yc /Yu
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /subsystem:$(CESubsystem) /MACHINE:IX86
+# ADD LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) aygshell.lib /nologo /base:"0x00010000" /stack:0x10000,0x1000 /entry:"WinMainCRTStartup" /debug /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /subsystem:$(CESubsystem) /MACHINE:IX86
+
+!ENDIF
+
+# Begin Target
+
+# Name "FaCENOACE - Win32 (WCE ARM) Release"
+# Name "FaCENOACE - Win32 (WCE ARM) Debug"
+# Name "FaCENOACE - Win32 (WCE x86) Release"
+# Name "FaCENOACE - Win32 (WCE x86) Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\CE_ARGV.CPP
+
+!IF "$(CFG)" == "FaCENOACE - Win32 (WCE ARM) Release"
+
+DEP_CPP_CE_AR=\
+ ".\CE_ARGV.H"\
+
+
+!ELSEIF "$(CFG)" == "FaCENOACE - Win32 (WCE ARM) Debug"
+
+DEP_CPP_CE_AR=\
+ ".\CE_ARGV.H"\
+
+
+!ELSEIF "$(CFG)" == "FaCENOACE - Win32 (WCE x86) Release"
+
+DEP_CPP_CE_AR=\
+ ".\CE_ARGV.H"\
+
+
+!ELSEIF "$(CFG)" == "FaCENOACE - Win32 (WCE x86) Debug"
+
+DEP_CPP_CE_AR=\
+ ".\CE_ARGV.H"\
+
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\CE_Screen_Output.cpp
+
+!IF "$(CFG)" == "FaCENOACE - Win32 (WCE ARM) Release"
+
+DEP_CPP_CE_SC=\
+ ".\CE_Screen_Output.h"\
+
+
+!ELSEIF "$(CFG)" == "FaCENOACE - Win32 (WCE ARM) Debug"
+
+DEP_CPP_CE_SC=\
+ ".\CE_Screen_Output.h"\
+
+
+!ELSEIF "$(CFG)" == "FaCENOACE - Win32 (WCE x86) Release"
+
+DEP_CPP_CE_SC=\
+ ".\CE_Screen_Output.h"\
+
+
+!ELSEIF "$(CFG)" == "FaCENOACE - Win32 (WCE x86) Debug"
+
+DEP_CPP_CE_SC=\
+ ".\CE_Screen_Output.h"\
+
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\FaCE.cpp
+
+!IF "$(CFG)" == "FaCENOACE - Win32 (WCE ARM) Release"
+
+DEP_CPP_FACE_=\
+ ".\FaCE.h"\
+ ".\StdAfx.h"\
+
+NODEP_CPP_FACE_=\
+ ".\ipapi.h"\
+ ".\ygshell.h"\
+
+
+!ELSEIF "$(CFG)" == "FaCENOACE - Win32 (WCE ARM) Debug"
+
+DEP_CPP_FACE_=\
+ ".\FaCE.h"\
+ ".\StdAfx.h"\
+
+NODEP_CPP_FACE_=\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\ace.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\ACE.i"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\ACE_export.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\ace_wchar.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\ace_wchar.inl"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Base_Thread_Adapter.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Base_Thread_Adapter.inl"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Basic_Types.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Basic_Types.i"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\CE_Screen_Output.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-all.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-cygwin32-common.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-cygwin32.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-g++-common.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-ghs-common.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-borland.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-common.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-ghs.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-mingw.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-msvc-5.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-msvc-6.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-msvc-7.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-msvc.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-visualage.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-WinCE.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Flag_Manip.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Flag_Manip.i"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Handle_Ops.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Handle_Ops.i"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Init_ACE.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Init_ACE.i"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\iosfwd.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Lib_Find.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Lib_Find.i"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Log_Msg.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Log_Msg_Callback.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Log_Priority.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Log_Record.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Log_Record.i"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Managed_Object.cpp"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Managed_Object.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Managed_Object.i"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Min_Max.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Object_Manager.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Object_Manager.i"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS.i"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Dirent.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Dirent.inl"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Errno.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Errno.inl"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Export.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Log_Msg_Attributes.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Log_Msg_Attributes.inl"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Memory.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Memory.inl"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS_String.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS_String.inl"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS_TLI.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS_TLI.inl"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\post.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\pre.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Sock_Connect.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Sock_Connect.i"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\streams.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\svc_export.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Adapter.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Adapter.inl"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Control.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Control.inl"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Exit.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Hook.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Trace.h"\
+ ".\ipapi.h"\
+ ".\ygshell.h"\
+
+
+!ELSEIF "$(CFG)" == "FaCENOACE - Win32 (WCE x86) Release"
+
+DEP_CPP_FACE_=\
+ ".\FaCE.h"\
+ ".\StdAfx.h"\
+
+NODEP_CPP_FACE_=\
+ ".\ipapi.h"\
+ ".\ygshell.h"\
+
+
+!ELSEIF "$(CFG)" == "FaCENOACE - Win32 (WCE x86) Debug"
+
+DEP_CPP_FACE_=\
+ ".\CE_ARGV.H"\
+ ".\CE_Screen_Output.h"\
+ ".\FaCE.h"\
+ {$(INCLUDE)}"aygshell.h"\
+ {$(INCLUDE)}"sipapi.h"\
+
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\FaCE.rc
+
+!IF "$(CFG)" == "FaCENOACE - Win32 (WCE ARM) Release"
+
+!ELSEIF "$(CFG)" == "FaCENOACE - Win32 (WCE ARM) Debug"
+
+!ELSEIF "$(CFG)" == "FaCENOACE - Win32 (WCE x86) Release"
+
+!ELSEIF "$(CFG)" == "FaCENOACE - Win32 (WCE x86) Debug"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\Main.cpp
+
+!IF "$(CFG)" == "FaCENOACE - Win32 (WCE ARM) Release"
+
+DEP_CPP_MAIN_=\
+ ".\FaCE.h"\
+
+
+!ELSEIF "$(CFG)" == "FaCENOACE - Win32 (WCE ARM) Debug"
+
+DEP_CPP_MAIN_=\
+ ".\FaCE.h"\
+
+NODEP_CPP_MAIN_=\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\ACE_export.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\ace_wchar.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\ace_wchar.inl"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Base_Thread_Adapter.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Base_Thread_Adapter.inl"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Basic_Types.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Basic_Types.i"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-all.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-cygwin32-common.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-cygwin32.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-g++-common.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-ghs-common.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-borland.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-common.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-ghs.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-mingw.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-msvc-5.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-msvc-6.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-msvc-7.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-msvc.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32-visualage.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-win32.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config-WinCE.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\config.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\iosfwd.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Log_Msg.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Log_Msg_Callback.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Log_Priority.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Log_Record.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Log_Record.i"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Managed_Object.cpp"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Managed_Object.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Managed_Object.i"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Min_Max.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Object_Manager.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Object_Manager.i"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS.i"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Dirent.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Dirent.inl"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Errno.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Errno.inl"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Export.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Log_Msg_Attributes.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Log_Msg_Attributes.inl"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Memory.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS_Memory.inl"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS_String.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS_String.inl"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS_TLI.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\OS_TLI.inl"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\post.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\pre.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\streams.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\svc_export.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Adapter.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Adapter.inl"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Control.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Control.inl"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Exit.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Thread_Hook.h"\
+ "..\..\toshiba\implementation\ACE_wrappers\ace\Trace.h"\
+
+
+!ELSEIF "$(CFG)" == "FaCENOACE - Win32 (WCE x86) Release"
+
+DEP_CPP_MAIN_=\
+ ".\FaCE.h"\
+
+
+!ELSEIF "$(CFG)" == "FaCENOACE - Win32 (WCE x86) Debug"
+
+DEP_CPP_MAIN_=\
+ ".\CE_Screen_Output.h"\
+ ".\FaCE.h"\
+
+
+!ENDIF
+
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\CE_ARGV.H
+# End Source File
+# Begin Source File
+
+SOURCE=.\CE_Screen_Output.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\FaCE.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\newres.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\resource.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# Begin Source File
+
+SOURCE=.\ACE_Racer.bmp
+# End Source File
+# Begin Source File
+
+SOURCE=.\FaCE.ico
+# End Source File
+# Begin Source File
+
+SOURCE=.\TAO.bmp
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=.\License.txt
+# End Source File
+# Begin Source File
+
+SOURCE=.\ReadMe.txt
+# End Source File
+# End Target
+# End Project
diff --git a/apps/FaCE/FaCENOACE.vcw b/apps/FaCE/FaCENOACE.vcw new file mode 100644 index 00000000000..98a3b7e412a --- /dev/null +++ b/apps/FaCE/FaCENOACE.vcw @@ -0,0 +1,29 @@ +Microsoft eMbedded Visual Tools Workspace File, Format Version 3.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "FaCENOACE"=".\FaCENOACE.vcp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/apps/Gateway/Gateway/Connection_Handler.cpp b/apps/Gateway/Gateway/Connection_Handler.cpp index 1e603dc73b7..95212a7b2c7 100644 --- a/apps/Gateway/Gateway/Connection_Handler.cpp +++ b/apps/Gateway/Gateway/Connection_Handler.cpp @@ -2,7 +2,6 @@ #define ACE_BUILD_SVC_DLL -#include "ace/OS_NS_string.h" #include "Event_Channel.h" #include "Concrete_Connection_Handlers.h" @@ -51,7 +50,8 @@ Connection_Handler::Connection_Handler (void) } Connection_Handler::Connection_Handler (const Connection_Config_Info &pci) - : local_addr_ (pci.local_port_), + : remote_addr_ (pci.remote_port_, pci.host_[0] == '\0' ? ACE_DEFAULT_SERVER_HOST : pci.host_), + local_addr_ (pci.local_port_), connection_id_ (pci.connection_id_), total_bytes_ (0), state_ (Connection_Handler::IDLE), @@ -59,10 +59,6 @@ Connection_Handler::Connection_Handler (const Connection_Config_Info &pci) max_timeout_ (pci.max_retry_timeout_), event_channel_ (pci.event_channel_) { - if (ACE_OS::strlen (pci.host_) > 0) - this->remote_addr_.set (pci.remote_port_, pci.host_); - else - this->remote_addr_.set (pci.remote_port_, ACE_DEFAULT_SERVER_HOST); // Set the priority of the Proxy. this->priority (int (pci.priority_)); } diff --git a/apps/Gateway/Gateway/Connection_Handler_Connector.cpp b/apps/Gateway/Gateway/Connection_Handler_Connector.cpp index 6382ed80220..a91d00f9e38 100644 --- a/apps/Gateway/Gateway/Connection_Handler_Connector.cpp +++ b/apps/Gateway/Gateway/Connection_Handler_Connector.cpp @@ -15,7 +15,7 @@ int Connection_Handler_Connector::initiate_connection (Connection_Handler *connection_handler, ACE_Synch_Options &synch_options) { - ACE_TCHAR addr_buf[MAXHOSTNAMELEN]; + char addr_buf[MAXHOSTNAMELEN]; // Mark ourselves as idle so that the various iterators will ignore // us until we are reconnected. @@ -25,8 +25,8 @@ Connection_Handler_Connector::initiate_connection (Connection_Handler *connectio // addr_buf. if (connection_handler->local_addr ().addr_to_string (addr_buf, sizeof addr_buf) == -1 || connection_handler->remote_addr ().addr_to_string (addr_buf, sizeof addr_buf) == -1) - ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("(%t) %p\n"), - ACE_TEXT ("can't obtain peer's address")), -1); + ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", + "can't obtain peer's address"), -1); // Try to connect to the Peer. if (this->connect (connection_handler, @@ -37,22 +37,22 @@ Connection_Handler_Connector::initiate_connection (Connection_Handler *connectio if (errno != EWOULDBLOCK) { connection_handler->state (Connection_Handler::FAILED); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) %p on address %s\n"), - ACE_TEXT ("connect"), addr_buf)); + ACE_DEBUG ((LM_DEBUG, "(%t) %p on address %s\n", + "connect", addr_buf)); return -1; } else { connection_handler->state (Connection_Handler::CONNECTING); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%t) in the process of connecting to %s\n"), + "(%t) in the process of connecting to %s\n", addr_buf)); } } else { connection_handler->state (Connection_Handler::ESTABLISHED); - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) connected to %s on %d\n"), + ACE_DEBUG ((LM_DEBUG, "(%t) connected to %s on %d\n", addr_buf, connection_handler->get_handle ())); } return 0; diff --git a/apps/Gateway/Gateway/File_Parser.cpp b/apps/Gateway/Gateway/File_Parser.cpp index 20e29990ea8..8c065bbbf8a 100644 --- a/apps/Gateway/Gateway/File_Parser.cpp +++ b/apps/Gateway/Gateway/File_Parser.cpp @@ -22,9 +22,9 @@ typedef FP::Return_Type FP_RETURN_TYPE; // File_Parser stuff. template <class ENTRY> int -File_Parser<ENTRY>::open (const ACE_TCHAR filename[]) +File_Parser<ENTRY>::open (const char filename[]) { - this->infile_ = ACE_OS::fopen (filename, ACE_TEXT ("r")); + this->infile_ = ACE_OS::fopen (filename, "r"); if (this->infile_ == 0) return -1; else diff --git a/apps/Gateway/Gateway/File_Parser.h b/apps/Gateway/Gateway/File_Parser.h index 1e8dd264809..8f09352fcd9 100644 --- a/apps/Gateway/Gateway/File_Parser.h +++ b/apps/Gateway/Gateway/File_Parser.h @@ -47,7 +47,7 @@ class File_Parser // <Consumer_Map>. public: // = Open and Close the file specified - int open (const ACE_TCHAR filename[]); + int open (const char filename[]); int close (void); virtual FP::Return_Type read_entry (ENTRY &entry, diff --git a/apps/Gateway/Gateway/Gateway.cpp b/apps/Gateway/Gateway/Gateway.cpp index bbe748a0cd4..f69d03b1f72 100644 --- a/apps/Gateway/Gateway/Gateway.cpp +++ b/apps/Gateway/Gateway/Gateway.cpp @@ -23,13 +23,13 @@ class ACE_Svc_Export Gateway : public ACE_Service_Object // for the <Gateway> routing. protected: // = Service configurator hooks. - virtual int init (int argc, ACE_TCHAR *argv[]); + virtual int init (int argc, char *argv[]); // Perform initialization. virtual int fini (void); // Perform termination when unlinked dynamically. - virtual int info (ACE_TCHAR **, size_t) const; + virtual int info (char **, size_t) const; // Return info about this service. // = Configuration methods. @@ -77,7 +77,7 @@ Gateway::handle_input (ACE_HANDLE h) } int -Gateway::init (int argc, ACE_TCHAR *argv[]) +Gateway::init (int argc, char *argv[]) { // Parse the "command-line" arguments. Options::instance ()->parse_args (argc, argv); @@ -92,8 +92,8 @@ Gateway::init (int argc, ACE_TCHAR *argv[]) if (ACE_Reactor::instance ()->register_handler (sig_set, this) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%t) %p\n"), - ACE_TEXT ("register_handler")), + "(%t) %p\n", + "register_handler"), -1); // Register this handler to receive events on stdin. We use this to @@ -102,8 +102,8 @@ Gateway::init (int argc, ACE_TCHAR *argv[]) ACE_Reactor::instance (), ACE_Thread_Manager::instance ()) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%t) %p\n"), - ACE_TEXT ("register_stdin_handler")), + "(%t) %p\n", + "register_stdin_handler"), -1); // If this->performance_window_ > 0 start a timer. @@ -114,11 +114,11 @@ Gateway::init (int argc, ACE_TCHAR *argv[]) (&this->event_channel_, 0, Options::instance ()->performance_window ()) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%t) %p\n"), - ACE_TEXT ("schedule_timer"))); + "(%t) %p\n", + "schedule_timer")); else ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("starting timer for %d seconds...\n"), + "starting timer for %d seconds...\n", Options::instance ()->performance_window ())); } @@ -159,12 +159,12 @@ Gateway::fini (void) // Returns information on the currently active service. int -Gateway::info (ACE_TCHAR **strp, size_t length) const +Gateway::info (char **strp, size_t length) const { - ACE_TCHAR buf[BUFSIZ]; + char buf[BUFSIZ]; - ACE_OS::strcpy - (buf, ACE_TEXT ("Gateway daemon\t # Application-level gateway\n")); + ACE_OS::sprintf (buf, "%s\t %s", "Gateway daemon", + "# Application-level gateway\n"); if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0) return -1; @@ -185,7 +185,7 @@ Gateway::parse_connection_config_file (void) if (connection_file.open (Options::instance ()->connection_config_file ()) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%t) %p\n"), + "(%t) %p\n", Options::instance ()->connection_config_file ()), -1); @@ -208,12 +208,12 @@ Gateway::parse_connection_config_file (void) if (pci.connection_id_ != 1) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%t) warning, the first connection id should be 1 not %d\n"), + "(%t) warning, the first connection id should be 1 not %d\n", pci.connection_id_)); } else if (previous_connection_id + 1 != pci.connection_id_) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%t) warning, connection ids should keep increasing by 1 and %d + 1 != %d\n"), + "(%t) warning, connection ids should keep increasing by 1 and %d + 1 != %d\n", previous_connection_id, pci.connection_id_)); @@ -223,13 +223,13 @@ Gateway::parse_connection_config_file (void) if (Options::instance ()->enabled (Options::DEBUG)) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%t) conn id = %d, ") - ACE_TEXT ("host = %s, ") - ACE_TEXT ("remote port = %d, ") - ACE_TEXT ("proxy role = %c, ") - ACE_TEXT ("max retry timeout = %d, ") - ACE_TEXT ("local port = %d, ") - ACE_TEXT ("priority = %d\n"), + "(%t) conn id = %d, " + "host = %s, " + "remote port = %d, " + "proxy role = %c, " + "max retry timeout = %d, " + "local port = %d, " + "priority = %d\n", pci.connection_id_, pci.host_, pci.remote_port_, @@ -257,7 +257,7 @@ Gateway::parse_connection_config_file (void) if (file_empty) ACE_ERROR ((LM_WARNING, - ACE_TEXT ("warning: connection connection_handler configuration file was empty\n"))); + "warning: connection connection_handler configuration file was empty\n")); return 0; } @@ -271,7 +271,7 @@ Gateway::parse_consumer_config_file (void) if (consumer_file.open (Options::instance ()->consumer_config_file ()) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%t) %p\n"), + "(%t) %p\n", Options::instance ()->consumer_config_file ()), -1); @@ -285,15 +285,15 @@ Gateway::parse_consumer_config_file (void) if (Options::instance ()->enabled (Options::DEBUG)) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%t) connection id = %d, payload = %d, ") - ACE_TEXT ("number of consumers = %d\n"), + "(%t) connection id = %d, payload = %d, " + "number of consumers = %d\n", cci_entry.connection_id_, cci_entry.type_, cci_entry.total_consumers_)); for (int i = 0; i < cci_entry.total_consumers_; i++) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%t) destination[%d] = %d\n"), + "(%t) destination[%d] = %d\n", i, cci_entry.consumers_[i])); } @@ -318,7 +318,7 @@ Gateway::parse_consumer_config_file (void) dispatch_set->insert (connection_handler); else ACE_ERROR ((LM_ERROR, - ACE_TEXT ("(%t) not found: destination[%d] = %d\n"), + "(%t) not found: destination[%d] = %d\n", i, cci_entry.consumers_[i])); } @@ -328,7 +328,7 @@ Gateway::parse_consumer_config_file (void) if (file_empty) ACE_ERROR ((LM_WARNING, - ACE_TEXT ("warning: consumer map configuration file was empty\n"))); + "warning: consumer map configuration file was empty\n")); return 0; } diff --git a/apps/Gateway/Gateway/Options.h b/apps/Gateway/Gateway/Options.h index b5971b35c88..ba39d2f1034 100644 --- a/apps/Gateway/Gateway/Options.h +++ b/apps/Gateway/Gateway/Options.h @@ -106,6 +106,10 @@ public: // The connector port number, i.e., the one that we use to actively // establish connections with a gatewayd and create a Consumer. + const char *connector_host (void) const; + // Our connector port host, i.e., the host running the gatewayd + // process. + const ACE_TCHAR *connection_config_file (void) const; // Name of the connection configuration file. diff --git a/apps/Gateway/Gateway/gateway.mpc b/apps/Gateway/Gateway/gateway.mpc index 9403ba858b1..64e5ec6288b 100644 --- a/apps/Gateway/Gateway/gateway.mpc +++ b/apps/Gateway/Gateway/gateway.mpc @@ -18,7 +18,7 @@ project(Gateway) : acelib { } project(gatewayd) : aceexe { - exename = gatewayd + after += Gateway libs += Gateway diff --git a/apps/Gateway/Gateway/gatewayd.cpp b/apps/Gateway/Gateway/gatewayd.cpp index bda60fe7d3f..8c698f4414b 100644 --- a/apps/Gateway/Gateway/gatewayd.cpp +++ b/apps/Gateway/Gateway/gatewayd.cpp @@ -29,7 +29,7 @@ ACE_RCSID (Gateway, "$Id$") int -ACE_TMAIN (int argc, ACE_TCHAR *argv[]) +main (int argc, char *argv[]) { if (ACE_OS::access (ACE_DEFAULT_SVC_CONF, F_OK) != 0) { @@ -38,14 +38,14 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) if (sp->init (argc - 1, argv + 1) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("init")), + "%p\n", + "init"), 1); // Run forever, performing the configured services until we // are shut down by a SIGINT/SIGQUIT signal. - ACE_Reactor::instance ()->run_reactor_event_loop (); + ACE_Reactor::run_event_loop (); // Destructor of <ACE_Service_Object_Ptr> automagically call // <fini>. @@ -54,15 +54,15 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { if (ACE_Service_Config::open (argc, argv) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("open")), + "%p\n", + "open"), 1); else // Use dynamic linking. // Run forever, performing the configured services until we are // shut down by a signal (e.g., SIGINT or SIGQUIT). - ACE_Reactor::instance ()->run_reactor_event_loop (); + ACE_Reactor::run_event_loop (); } return 0; } diff --git a/apps/Gateway/Gateway/svc.conf b/apps/Gateway/Gateway/svc.conf index 3698b0e3e13..9b35a7dcbd6 100644 --- a/apps/Gateway/Gateway/svc.conf +++ b/apps/Gateway/Gateway/svc.conf @@ -1,3 +1,3 @@ #static Svc_Manager "-d -p 2913" -dynamic Gateway Service_Object * Gateway:_make_Gateway() active "-b -d -c C|S -a C|S -P connection_config -C consumer_config" +dynamic Gateway Service_Object * ./Gateway:_make_Gateway() active "-b -d -c C|S -a C|S -P connection_config -C consumer_config" diff --git a/apps/Gateway/Peer/Options.cpp b/apps/Gateway/Peer/Options.cpp index 0b33552e629..b1b057f33ca 100644 --- a/apps/Gateway/Peer/Options.cpp +++ b/apps/Gateway/Peer/Options.cpp @@ -19,7 +19,7 @@ void Options::print_usage_and_die (void) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("%n [-a {C|S}:acceptor-port] [-c {C|S}:connector-port] [-C connection-id] [-h gateway-host] [-q max-queue-size] [-t timeout] [-v]\n"))); + "%n [-a {C|S}:acceptor-port] [-c {C|S}:connector-port] [-C connection-id] [-h gateway-host] [-q max-queue-size] [-t timeout] [-v]\n")); ACE_OS::exit (1); } @@ -93,7 +93,7 @@ Options::supplier_connector_port (void) const return this->supplier_connector_port_; } -const ACE_TCHAR * +const char * Options::connector_host (void) const { return this->connector_host_; @@ -106,9 +106,9 @@ Options::enabled (int option) const } void -Options::parse_args (int argc, ACE_TCHAR *argv[]) +Options::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("a:c:C:h:m:t:v"), 0); + ACE_Get_Opt get_opt (argc, argv, "a:c:C:h:m:t:v", 0); for (int c; (c = get_opt ()) != -1; ) { @@ -118,11 +118,10 @@ Options::parse_args (int argc, ACE_TCHAR *argv[]) { // Become an Acceptor. - for (ACE_TCHAR *flag = ACE_OS::strtok (get_opt.opt_arg (), - ACE_TEXT ("|")); + for (char *flag = ACE_OS::strtok (get_opt.opt_arg (), "|"); flag != 0; - flag = ACE_OS::strtok (0, ACE_TEXT ("|"))) - if (ACE_OS::strncasecmp (flag, ACE_TEXT ("C"), 1) == 0) + flag = ACE_OS::strtok (0, "|")) + if (ACE_OS::strncasecmp (flag, "C", 1) == 0) { ACE_SET_BITS (this->options_, Options::CONSUMER_ACCEPTOR); @@ -130,7 +129,7 @@ Options::parse_args (int argc, ACE_TCHAR *argv[]) // Set the Consumer Acceptor port number. this->consumer_acceptor_port_ = ACE_OS::atoi (flag + 2); } - else if (ACE_OS::strncasecmp (flag, ACE_TEXT ("S"), 1) == 0) + else if (ACE_OS::strncasecmp (flag, "S", 1) == 0) { ACE_SET_BITS (this->options_, Options::SUPPLIER_ACCEPTOR); @@ -145,11 +144,10 @@ Options::parse_args (int argc, ACE_TCHAR *argv[]) { // Become a Connector. - for (ACE_TCHAR *flag = ACE_OS::strtok (get_opt.opt_arg (), - ACE_TEXT ("|")); + for (char *flag = ACE_OS::strtok (get_opt.opt_arg (), "|"); flag != 0; - flag = ACE_OS::strtok (0, ACE_TEXT ("|"))) - if (ACE_OS::strncasecmp (flag, ACE_TEXT ("C"), 1) == 0) + flag = ACE_OS::strtok (0, "|")) + if (ACE_OS::strncasecmp (flag, "C", 1) == 0) { ACE_SET_BITS (this->options_, Options::CONSUMER_CONNECTOR); @@ -157,7 +155,7 @@ Options::parse_args (int argc, ACE_TCHAR *argv[]) // Set the Consumer Connector port number. this->consumer_connector_port_ = ACE_OS::atoi (flag + 2); } - else if (ACE_OS::strncasecmp (flag, ACE_TEXT ("S"), 1) == 0) + else if (ACE_OS::strncasecmp (flag, "S", 1) == 0) { ACE_SET_BITS (this->options_, Options::SUPPLIER_CONNECTOR); diff --git a/apps/Gateway/Peer/Options.h b/apps/Gateway/Peer/Options.h index bc872fe7df4..371b043deac 100644 --- a/apps/Gateway/Peer/Options.h +++ b/apps/Gateway/Peer/Options.h @@ -39,7 +39,7 @@ public: static Options *instance (void); // Return Singleton. - void parse_args (int argc, ACE_TCHAR *argv[]); + void parse_args (int argc, char *argv[]); // Parse the arguments and set the options. // = Accessor methods. @@ -64,7 +64,7 @@ public: // The connector port number, i.e., the one that we use to actively // establish connections with a gatewayd and create a Consumer. - const ACE_TCHAR *connector_host (void) const; + const char *connector_host (void) const; // Our connector port host, i.e., the host running the gatewayd // process. @@ -119,7 +119,7 @@ private: // The connector port number, i.e., the one that we use to actively // establish connections with a gatewayd and create a Consumer. - const ACE_TCHAR *connector_host_; + const char *connector_host_; // Our connector host, i.e., where the gatewayd process is running. long timeout_; diff --git a/apps/Gateway/Peer/Peer.cpp b/apps/Gateway/Peer/Peer.cpp index 074d1479c61..bd0c4db4de4 100644 --- a/apps/Gateway/Peer/Peer.cpp +++ b/apps/Gateway/Peer/Peer.cpp @@ -4,7 +4,6 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" -#include "ace/OS_NS_unistd.h" #include "ace/Signal.h" #include "Peer.h" @@ -28,21 +27,21 @@ int Peer_Handler::open (void *a) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("handle = %d\n"), + "handle = %d\n", this->peer ().get_handle ())); // Call down to the base class to activate and register this handler // with an <ACE_Reactor>. if (this->inherited::open (a) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("open")), + "%p\n", + "open"), -1); if (this->peer ().enable (ACE_NONBLOCK) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("enable")), + "%p\n", + "enable"), -1); ACE_Time_Value timeout (Options::instance ()->timeout ()); @@ -52,8 +51,8 @@ Peer_Handler::open (void *a) if (ACE_Reactor::instance ()->schedule_timer (this, 0, timeout) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("schedule_timer"))); + "%p\n", + "schedule_timer")); // If there are events left in the queue, make sure we enable the // <ACE_Reactor> appropriately to get them sent out. @@ -61,8 +60,8 @@ Peer_Handler::open (void *a) && ACE_Reactor::instance ()->schedule_wakeup (this, ACE_Event_Handler::WRITE_MASK) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("schedule_wakeup")), + "%p\n", + "schedule_wakeup"), -1); // First action is to wait to be notified of our connection id. @@ -93,12 +92,12 @@ Peer_Handler::transmit (ACE_Message_Block *mb, { if (errno == EWOULDBLOCK) // The queue has filled up! ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("gateway is flow controlled, so we're dropping events"))); + "%p\n", + "gateway is flow controlled, so we're dropping events")); else ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("transmission failure in transmit()"))); // Function name fixed. + "%p\n", + "transmission failure in transmit()")); // Function name fixed. // Caller is responsible for freeing a ACE_Message_Block // if failures occur. mb->release (); @@ -132,7 +131,7 @@ Peer_Handler::transmit_stdin (void) { case 0: ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("stdin closing down\n"))); + "stdin closing down\n")); // Take stdin out of the ACE_Reactor so we stop trying to // send events. @@ -146,8 +145,8 @@ Peer_Handler::transmit_stdin (void) case -1: mb->release (); ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("read"))); + "%p\n", + "read")); result = 0; // break; /* NOTREACHED */ @@ -164,7 +163,7 @@ Peer_Handler::transmit_stdin (void) else { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Must transmit over an opened channel.\n"))); + "Must transmit over an opened channel.\n")); result = -1; // Save return value at here, return at exit of function. } // If transmit error, the stdin-thread will be cancelled, so should @@ -197,7 +196,7 @@ Peer_Handler::nonblk_put (ACE_Message_Block *mb) { // We didn't manage to send everything, so requeue. ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("queueing activated on handle %d to connection id %d\n"), + "queueing activated on handle %d to connection id %d\n", this->get_handle (), this->connection_id_)); @@ -206,15 +205,15 @@ Peer_Handler::nonblk_put (ACE_Message_Block *mb) (mb, (ACE_Time_Value *) &ACE_Time_Value::zero) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("enqueue_head")), + "%p\n", + "enqueue_head"), -1); // Tell ACE_Reactor to call us back when we can send again. if (ACE_Reactor::instance ()->schedule_wakeup (this, ACE_Event_Handler::WRITE_MASK) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("schedule_wakeup")), + "%p\n", + "schedule_wakeup"), -1); return 0; } @@ -231,7 +230,7 @@ Peer_Handler::handle_output (ACE_HANDLE) ACE_Message_Block *mb = 0; ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("in handle_output\n"))); + "in handle_output\n")); if (this->msg_queue ()->dequeue_head (mb, @@ -249,8 +248,8 @@ Peer_Handler::handle_output (ACE_HANDLE) // failures occur. mb->release (); ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("transmission failure in handle_output"))); + "%p\n", + "transmission failure in handle_output")); /* FALLTHROUGH */ default: // Sent the whole thing. // If we succeed in writing the entire event (or we did not @@ -262,15 +261,15 @@ Peer_Handler::handle_output (ACE_HANDLE) if (this->msg_queue ()->is_empty ()) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("queue now empty on handle %d to connection id %d\n"), + "queue now empty on handle %d to connection id %d\n", this->get_handle (), this->connection_id_)); if (ACE_Reactor::instance ()->cancel_wakeup (this, ACE_Event_Handler::WRITE_MASK) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("cancel_wakeup"))); + "%p\n", + "cancel_wakeup")); } } return 0; @@ -278,8 +277,8 @@ Peer_Handler::handle_output (ACE_HANDLE) else // If the list is empty there's a bug! ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("dequeue_head")), + "%p\n", + "dequeue_head"), 0); } @@ -325,7 +324,7 @@ Peer_Handler::send (ACE_Message_Block *mb) } ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("sent %d bytes, total bytes sent = %d\n"), + "sent %d bytes, total bytes sent = %d\n", n, this->total_bytes_)); return n; @@ -359,10 +358,10 @@ Peer_Handler::recv (ACE_Message_Block *&mb) || header_received == 0 /* EOF */) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("Recv error during header read"))); + "%p\n", + "Recv error during header read")); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("attempted to read %d bytes\n"), + "attempted to read %d bytes\n", header_bytes_left_to_read)); this->msg_frag_ = this->msg_frag_->release (); return header_received; @@ -375,8 +374,8 @@ Peer_Handler::recv (ACE_Message_Block *&mb) if (this->msg_frag_->length () < HEADER_SIZE) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Partial header received: only %d bytes\n"), - this->msg_frag_->length ())); + "Partial header received: only %d bytes\n", + this->msg_frag_->length ())); // Notify the caller that we didn't get an entire event. errno = EWOULDBLOCK; return -1; @@ -391,7 +390,7 @@ Peer_Handler::recv (ACE_Message_Block *&mb) // This data_ payload is too big! errno = EINVAL; ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("Data payload is too big (%d bytes)\n"), + "Data payload is too big (%d bytes)\n", event->header_.len_)); return -1; } @@ -456,13 +455,13 @@ Peer_Handler::recv (ACE_Message_Block *&mb) } ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%t) connection id = %d, cur len = %d, total bytes read = %d\n"), + "(%t) connection id = %d, cur len = %d, total bytes read = %d\n", event->header_.connection_id_, event->header_.len_, data_received + header_received)); if (Options::instance ()->enabled (Options::VERBOSE)) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("data_ = %*s\n"), + "data_ = %*s\n", event->header_.len_ - 2, event->data_)); return data_received + header_received; @@ -476,7 +475,7 @@ int Peer_Handler::handle_input (ACE_HANDLE sd) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("in handle_input, sd = %d\n"), + "in handle_input, sd = %d\n", sd)); if (sd == ACE_STDIN) // Handle event from stdin. return this->transmit_stdin (); @@ -498,12 +497,12 @@ Peer_Handler::await_connection_id (void) { if (n == 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("gatewayd has closed down unexpectedly\n")), + "gatewayd has closed down unexpectedly\n"), -1); else ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p, bytes received on handle %d = %d\n"), - ACE_TEXT ("recv"), + "%p, bytes received on handle %d = %d\n", + "recv", this->get_handle (), n), -1); @@ -512,7 +511,7 @@ Peer_Handler::await_connection_id (void) { this->connection_id_ = ntohl (this->connection_id_); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("assigned connection id %d\n"), + "assigned connection id %d\n", this->connection_id_)); } @@ -538,8 +537,8 @@ Peer_Handler::await_connection_id (void) ACE_Reactor::instance (), ACE_Thread_Manager::instance ()) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("(%t) %p\n"), - ACE_TEXT ("register_stdin_handler")), + "(%t) %p\n", + "register_stdin_handler"), -1); // Next time in await_connection_id(), I'll don't call @@ -579,7 +578,7 @@ Peer_Handler::await_events (void) { case 0: ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("gatewayd has closed down\n")), + "gatewayd has closed down\n"), -1); /* NOTREACHED */ case -1: @@ -588,8 +587,8 @@ Peer_Handler::await_events (void) return 0; else ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("recv")), + "%p\n", + "recv"), -1); /* NOTREACHED */ default: @@ -601,13 +600,13 @@ Peer_Handler::await_events (void) this->total_bytes_ += mb->length (); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("route id = %d, cur len = %d, total len = %d\n"), + "route id = %d, cur len = %d, total len = %d\n", event->header_.connection_id_, event->header_.len_, this->total_bytes_)); if (Options::instance ()->enabled (Options::VERBOSE)) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("data_ = %*s\n"), + "data_ = %*s\n", event->header_.len_ - 2, event->data_)); mb->release (); @@ -641,8 +640,8 @@ Peer_Handler::handle_close (ACE_HANDLE, if (this->get_handle () != ACE_INVALID_HANDLE) { ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("shutting down Peer on handle %d\n"), - this->get_handle ())); + "shutting down Peer on handle %d\n", + this->get_handle ())); ACE_Reactor_Mask mask = ACE_Event_Handler::DONT_CALL | ACE_Event_Handler::READ_MASK; @@ -658,9 +657,9 @@ Peer_Handler::handle_close (ACE_HANDLE, if (ACE_Reactor::instance ()->remove_handler (this, mask) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("handle = %d: %p\n"), + "handle = %d: %p\n", this->get_handle (), - ACE_TEXT ("remove_handler")), + "remove_handler"), -1); // Close down the peer. this->peer ().close (); @@ -678,23 +677,23 @@ Peer_Acceptor::start (u_short port) this->addr_.set (port); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("opening acceptor at port %d\n"), + "opening acceptor at port %d\n", port)); // Call down to the <Acceptor::open> method. if (this->inherited::open (this->addr_) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("open")), + "%p\n", + "open"), -1); else if (this->acceptor ().get_local_addr (this->addr_) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("get_local_addr")), + "%p\n", + "get_local_addr"), -1); else ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("accepting at port %d\n"), + "accepting at port %d\n", this->addr_.get_port_number ())); return 0; } @@ -740,18 +739,18 @@ Peer_Connector::open_connector (Peer_Handler *&peer_handler, Options::instance ()->connector_host ()); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("connecting to %s:%d\n"), + "connecting to %s:%d\n", addr.get_host_name (), addr.get_port_number ())); if (this->connect (peer_handler, addr) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("connect")), + "%p\n", + "connect"), -1); else ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("connected to %C:%d\n"), + "connected to %s:%d\n", addr.get_host_name (), addr.get_port_number ())); return 0; @@ -782,8 +781,8 @@ Peer_Factory::handle_signal (int signum, siginfo_t *, ucontext_t *) if (signum != SIGPIPE) { // Shut down the main event loop. - ACE_DEBUG((LM_NOTICE, ACE_TEXT ("Exit case signal\n"))); // Why do I exit? - ACE_Reactor::instance ()->end_reactor_event_loop(); + ACE_DEBUG((LM_NOTICE, "Exit case signal\n")); // Why do I exit? + ACE_Reactor::end_event_loop(); } return 0; @@ -792,11 +791,11 @@ Peer_Factory::handle_signal (int signum, siginfo_t *, ucontext_t *) // Returns information on the currently active service. int -Peer_Factory::info (ACE_TCHAR **strp, size_t length) const +Peer_Factory::info (char **strp, size_t length) const { - ACE_TCHAR buf[BUFSIZ]; - ACE_TCHAR consumer_addr_str[BUFSIZ]; - ACE_TCHAR supplier_addr_str[BUFSIZ]; + char buf[BUFSIZ]; + char consumer_addr_str[BUFSIZ]; + char supplier_addr_str[BUFSIZ]; ACE_INET_Addr addr; @@ -811,12 +810,13 @@ Peer_Factory::info (ACE_TCHAR **strp, size_t length) const sizeof addr) == -1) return -1; - ACE_OS::strcpy (buf, ACE_TEXT ("peerd\t C:")); - ACE_OS::strcat (buf, consumer_addr_str); - ACE_OS::strcat (buf, ACE_TEXT ("|S:")); - ACE_OS::strcat (buf, supplier_addr_str); - ACE_OS::strcat - (buf, ACE_TEXT ("/tcp # Gateway traffic generator and data sink\n")); + ACE_OS::sprintf (buf, + "%s\t C:%s|S:%s/%s %s", + "peerd", + consumer_addr_str, + supplier_addr_str, + "tcp", + "# Gateway traffic generator and data sink\n"); if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0) return -1; @@ -840,7 +840,7 @@ Peer_Factory::fini (void) // the peer. int -Peer_Factory::init (int argc, ACE_TCHAR *argv[]) +Peer_Factory::init (int argc, char *argv[]) { Options::instance ()->parse_args (argc, argv); @@ -856,28 +856,28 @@ Peer_Factory::init (int argc, ACE_TCHAR *argv[]) if (ACE_Reactor::instance ()->register_handler (sig_set, this) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("register_handler")), + "%p\n", + "register_handler"), -1); if (Options::instance ()->enabled (Options::SUPPLIER_ACCEPTOR) && this->supplier_acceptor_.start (Options::instance ()->supplier_acceptor_port ()) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("Acceptor::open")), + "%p\n", + "Acceptor::open"), -1); else if (Options::instance ()->enabled (Options::CONSUMER_ACCEPTOR) && this->consumer_acceptor_.start (Options::instance ()->consumer_acceptor_port ()) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("Acceptor::open")), + "%p\n", + "Acceptor::open"), -1); else if (this->connector_.open () == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("Connector::open")), + "%p\n", + "Connector::open"), -1); return 0; } diff --git a/apps/Gateway/Peer/Peer.h b/apps/Gateway/Peer/Peer.h index 0723882a243..34bf856f8c1 100644 --- a/apps/Gateway/Peer/Peer.h +++ b/apps/Gateway/Peer/Peer.h @@ -227,13 +227,13 @@ class ACE_Svc_Export Peer_Factory : public ACE_Service_Object public: // = Dynamic initialization and termination hooks from <ACE_Service_Object>. - virtual int init (int argc, ACE_TCHAR *argv[]); + virtual int init (int argc, char *argv[]); // Initialize the acceptor and connector. virtual int fini (void); // Perform termination activities. - virtual int info (ACE_TCHAR **, size_t) const; + virtual int info (char **, size_t) const; // Return info about this service. virtual int handle_signal (int signum, siginfo_t *, ucontext_t *); diff --git a/apps/Gateway/Peer/peerd.cpp b/apps/Gateway/Peer/peerd.cpp index f4abd599322..94df916851e 100644 --- a/apps/Gateway/Peer/peerd.cpp +++ b/apps/Gateway/Peer/peerd.cpp @@ -18,46 +18,45 @@ // // ============================================================================ -#include "ace/OS_NS_unistd.h" #include "Peer.h" ACE_RCSID(Peer, peerd, "$Id$") int -ACE_TMAIN (int argc, ACE_TCHAR *argv[]) +main (int argc, char *argv[]) { - if (ACE_OS::access (ACE_DEFAULT_SVC_CONF, F_OK) != 0) + if (ACE_OS::access (ACE_DEFAULT_SVC_CONF, F_OK) != 0) { // Use static linking. ACE_Service_Object_Ptr sp = ACE_SVC_INVOKE (Peer_Factory); if (sp->init (argc - 1, argv + 1) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("init")), + "%p\n", + "init"), 1); // Run forever, performing the configured services until we are // shut down by a SIGINT/SIGQUIT signal. - ACE_Reactor::instance ()->run_reactor_event_loop (); + ACE_Reactor::run_event_loop (); // Destructor of <ACE_Service_Object_Ptr> automagically call // <fini>. } - else + else { - if (ACE_Service_Config::open (argc, argv) == -1) + if (ACE_Service_Config::open (argc, argv) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("open")), + "%p\n", + "open"), 1); else // Use dynamic linking. // Run forever, performing the configured services until we // are shut down by a signal (e.g., SIGINT or SIGQUIT). - ACE_Reactor::instance ()->run_reactor_event_loop (); + ACE_Reactor::run_event_loop (); } return 0; } diff --git a/apps/Gateway/Peer/svc.conf b/apps/Gateway/Peer/svc.conf index 707f457da2f..c27eb06cec8 100644 --- a/apps/Gateway/Peer/svc.conf +++ b/apps/Gateway/Peer/svc.conf @@ -1,2 +1,2 @@ #static Svc_Manager "-d -p 291" -dynamic Peer1 Service_Object * Gateway_Peer:_make_Peer_Factory() active "-a C|S" +dynamic Peer1 Service_Object * ./Peer:_make_Peer_Factory() active "-a C|S" diff --git a/apps/JAWS/ChangeLog b/apps/JAWS/ChangeLog index 3b8e95edbdb..0b8c3274945 100644 --- a/apps/JAWS/ChangeLog +++ b/apps/JAWS/ChangeLog @@ -1,10 +1,3 @@ -Thu Aug 26 08:13:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl> - - * clients/Caching/http_client.cpp: - * server/HTTP_Response.cpp: - Added include of ace/os_include/os_ctype.h to fix compile problems - in our daily builds. - Tue Feb 25 18:58:26 2003 Carlos O'Ryan <coryan@atdesk.com> * clients/WebSTONE/src/cgi-send: @@ -51,19 +44,19 @@ Mon Aug 13 14:04:44 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> 1) Allow a static libHTTPU.a to be built when "make static_libs_only=1" is used. - + 2) When I try to build both JAWS and JAWS2 with the same ACE_ROOT, the libJAWS.* that is built and installed first prevents the other JAWS from properly compiling. This resolves this problem by renaming the JAWS2 library to libJAWS2.*. - + 3) The JAWS2 subdirectory is now descended into by - apps/Makefile. - + apps/Makefile. + 4) The Makefile in JAWS2 now descends into HTTPU and JAWS to build those libraries. - + Tue Jun 12 20:35:26 2001 Krishnakumar B <kitty@cs.wustl.edu> * clients/Blobby/Blob_Handler.cpp: diff --git a/apps/JAWS/clients/Caching/http_client.cpp b/apps/JAWS/clients/Caching/http_client.cpp index afbc38a2513..6022cb289f2 100644 --- a/apps/JAWS/clients/Caching/http_client.cpp +++ b/apps/JAWS/clients/Caching/http_client.cpp @@ -4,7 +4,7 @@ // // = LIBRARY // apps/JAWS/clients/Caching -// +// // = FILENAME // http_client.cpp // @@ -14,11 +14,9 @@ // // = AUTHOR // James Hu -// +// // ============================================================================ -#include "ace/OS_NS_stdio.h" -#include "ace/os_include/os_ctype.h" #include "http_handler.h" ACE_RCSID(Caching, http_client, "$Id$") @@ -52,8 +50,8 @@ main (int, char *[]) if (*s == '!') { - do - s++; + do + s++; while (isspace (*s)); // Shell command. diff --git a/apps/JAWS/clients/Caching/http_handler.cpp b/apps/JAWS/clients/Caching/http_handler.cpp index 0d879af7173..36bd8343d34 100644 --- a/apps/JAWS/clients/Caching/http_handler.cpp +++ b/apps/JAWS/clients/Caching/http_handler.cpp @@ -13,7 +13,6 @@ // // ============================================================================ -#include "ace/OS_NS_string.h" #include "ace/Filecache.h" #include "http_handler.h" diff --git a/apps/JAWS/server/HTTP_Response.cpp b/apps/JAWS/server/HTTP_Response.cpp index e187ba10934..50c14604253 100644 --- a/apps/JAWS/server/HTTP_Response.cpp +++ b/apps/JAWS/server/HTTP_Response.cpp @@ -1,11 +1,9 @@ // $Id$ -#include "ace/OS_NS_stdio.h" -#include "ace/OS_NS_string.h" -#include "ace/os_include/os_ctype.h" #include "ace/Process.h" #include "ace/Mem_Map.h" #include "ace/Log_Msg.h" +#include "ace/OS_NS_stdio.h" #include "HTTP_Response.h" #include "HTTP_Request.h" diff --git a/apps/JAWS/server/HTTP_Server.cpp b/apps/JAWS/server/HTTP_Server.cpp index 99aa97e71ff..9aaa4b920d4 100644 --- a/apps/JAWS/server/HTTP_Server.cpp +++ b/apps/JAWS/server/HTTP_Server.cpp @@ -4,7 +4,6 @@ #define ACE_BUILD_SVC_DLL #endif /* ACE_BUILD_SVC_DLL */ -#include "ace/OS_NS_string.h" #include "ace/Get_Opt.h" #include "ace/Asynch_Acceptor.h" #include "ace/LOCK_SOCK_Acceptor.h" diff --git a/apps/JAWS/server/HTTP_Server.h b/apps/JAWS/server/HTTP_Server.h index a81f34d244e..a9e630acedd 100644 --- a/apps/JAWS/server/HTTP_Server.h +++ b/apps/JAWS/server/HTTP_Server.h @@ -17,12 +17,12 @@ #ifndef HTTP_SERVER_H #define HTTP_SERVER_H +#include "ace/Service_Object.h" + #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Service_Config.h" -#include "ace/Service_Object.h" #include "ace/Thread_Manager.h" #include "ace/Acceptor.h" #include "ace/LOCK_SOCK_Acceptor.h" diff --git a/apps/JAWS/server/IO.cpp b/apps/JAWS/server/IO.cpp index 63267987b81..5594c713b54 100644 --- a/apps/JAWS/server/IO.cpp +++ b/apps/JAWS/server/IO.cpp @@ -1,13 +1,12 @@ // $Id$ -#include "ace/OS_NS_string.h" -#include "ace/OS_NS_sys_uio.h" -#include "ace/OS_NS_sys_socket.h" #include "ace/Message_Block.h" #include "ace/SOCK_Stream.h" #include "ace/Filecache.h" #include "IO.h" #include "HTTP_Helpers.h" +#include "ace/OS_NS_sys_uio.h" +#include "ace/OS_NS_sys_socket.h" ACE_RCSID(server, IO, "$Id$") diff --git a/apps/JAWS3/jaws3/Reactive_IO_Helpers.h b/apps/JAWS3/jaws3/Reactive_IO_Helpers.h index 966f99a0e55..96a7bfc4114 100644 --- a/apps/JAWS3/jaws3/Reactive_IO_Helpers.h +++ b/apps/JAWS3/jaws3/Reactive_IO_Helpers.h @@ -62,8 +62,6 @@ private: ACE_Reactor::instance ()->schedule_timer (this, 0, this->tv_); } -public: // needed for destructor due to "aCC: HP ANSI C++ B3910B A.03.39" compiler bug - ~JAWS_IO_Reactive_Handler (void) { if (this->timer_id_ != -1) diff --git a/apps/JAWS3/jaws3/Task_Timer.cpp b/apps/JAWS3/jaws3/Task_Timer.cpp index a429a3fcf8e..c3775020193 100644 --- a/apps/JAWS3/jaws3/Task_Timer.cpp +++ b/apps/JAWS3/jaws3/Task_Timer.cpp @@ -4,8 +4,6 @@ #define JAWS_BUILD_DLL #endif -#include "ace/OS_NS_sys_time.h" - #include "jaws3/Task_Timer.h" #include "jaws3/Timer_Helpers.h" diff --git a/apps/JAWS3/jaws3/Templates.cpp b/apps/JAWS3/jaws3/Templates.cpp index 4d51c3fab9c..32bd4642109 100644 --- a/apps/JAWS3/jaws3/Templates.cpp +++ b/apps/JAWS3/jaws3/Templates.cpp @@ -97,19 +97,4 @@ template class JAWS_SYMBOL_TABLE_ITERATOR_BASE; template class JAWS_SYMBOL_TABLE_ITERATOR; template class JAWS_SYMBOL_TABLE_REVERSE_ITERATOR; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) -template ACE_Singleton<ACE_Message_Block, ACE_Null_Mutex> *ACE_Singleton<ACE_Message_Block, ACE_Null_Mutex>::singleton_; -template ACE_Singleton<JAWS_Asynch_IO, ACE_Thread_Mutex> *ACE_Singleton<JAWS_Asynch_IO, ACE_Thread_Mutex>::singleton_; -template ACE_Singleton<JAWS_Concurrency, ACE_Thread_Mutex> *ACE_Singleton<JAWS_Concurrency, ACE_Thread_Mutex>::singleton_; -template ACE_Singleton<JAWS_IO, ACE_Thread_Mutex> *ACE_Singleton<JAWS_IO, ACE_Thread_Mutex>::singleton_; -template ACE_Singleton<JAWS_Options, ACE_Thread_Mutex> *ACE_Singleton<JAWS_Options, ACE_Thread_Mutex>::singleton_; -template ACE_Singleton<JAWS_Reactive_IO, ACE_Thread_Mutex> *ACE_Singleton<JAWS_Reactive_IO, ACE_Thread_Mutex>::singleton_; -template ACE_Singleton<JAWS_Signal_Task, ACE_Thread_Mutex> *ACE_Singleton<JAWS_Signal_Task, ACE_Thread_Mutex>::singleton_; -template ACE_Singleton<JAWS_Synch_IO, ACE_Thread_Mutex> *ACE_Singleton<JAWS_Synch_IO, ACE_Thread_Mutex>::singleton_; -template ACE_Singleton<JAWS_THYBRID_Concurrency, ACE_Thread_Mutex> *ACE_Singleton<JAWS_THYBRID_Concurrency, ACE_Thread_Mutex>::singleton_; -template ACE_Singleton<JAWS_TPOOL_Concurrency, ACE_Thread_Mutex> *ACE_Singleton<JAWS_TPOOL_Concurrency, ACE_Thread_Mutex>::singleton_; -template ACE_Singleton<JAWS_TPR_Concurrency, ACE_Thread_Mutex> *ACE_Singleton<JAWS_TPR_Concurrency, ACE_Thread_Mutex>::singleton_; -template ACE_Singleton<JAWS_Task_Timer, ACE_Thread_Mutex> *ACE_Singleton<JAWS_Task_Timer, ACE_Thread_Mutex>::singleton_; -template ACE_Singleton<JAWS_Timer, ACE_Thread_Mutex> *ACE_Singleton<JAWS_Timer, ACE_Thread_Mutex>::singleton_; #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/apps/drwho/File_Manager.cpp b/apps/drwho/File_Manager.cpp index 5f138fe70fc..7ee34489523 100644 --- a/apps/drwho/File_Manager.cpp +++ b/apps/drwho/File_Manager.cpp @@ -173,7 +173,8 @@ template class ACE_Singleton<File_Manager,ACE_Null_Mutex>; #pragma instantiate ACE_Singleton<File_Manager,ACE_Null_Mutex> -#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION) +#elif defined (__GNUC__) && (defined (_AIX) || defined (__hpux)) + template ACE_Singleton<File_Manager, ACE_Null_Mutex> * ACE_Singleton<File_Manager, ACE_Null_Mutex>::singleton_; diff --git a/apps/drwho/Rwho_DB_Manager.h b/apps/drwho/Rwho_DB_Manager.h index 2dd8bf73128..ff1dde83a65 100644 --- a/apps/drwho/Rwho_DB_Manager.h +++ b/apps/drwho/Rwho_DB_Manager.h @@ -17,7 +17,6 @@ #ifndef _RWHO_DB_MANAGER_H #define _RWHO_DB_MANAGER_H -#include <sys/types.h> #include <protocols/rwhod.h> #include "ace/Dirent.h" diff --git a/apps/gperf/ChangeLog b/apps/gperf/ChangeLog index af7bb6444ce..ee1c95132bc 100644 --- a/apps/gperf/ChangeLog +++ b/apps/gperf/ChangeLog @@ -1,11 +1,3 @@ -Fri Aug 5 15:30:00 UTC 2004 Simon Massey <simon.massey@prismtechnologies.com> - - * apps/gperf/tests/gperf_test.mpb - * apps/gperf/tests/tests.mpc - - gperf is not built on cross compiled targets, thus tests will not run! - Therefore added the dependancy to the build of these test. - Fri Apr 23 21:18:17 2004 Ossama Othman <ossama@dre.vanderbilt.edu> * src/Options.h (operator !=): diff --git a/apps/gperf/tests/gperf_test.mpb b/apps/gperf/tests/gperf_test.mpb index c4615b1adc4..8a786383c8f 100644 --- a/apps/gperf/tests/gperf_test.mpb +++ b/apps/gperf/tests/gperf_test.mpb @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project: aceexe, crosscompile { +project: aceexe { after += gperf Define_Custom(GPERF) { command = $(ACE_ROOT)/bin/gperf diff --git a/apps/gperf/tests/tests.mpc b/apps/gperf/tests/tests.mpc index cf6f1506133..c90648dad84 100644 --- a/apps/gperf/tests/tests.mpc +++ b/apps/gperf/tests/tests.mpc @@ -7,12 +7,10 @@ project(cinset): gperf_test { verbatim(gnuace, bottom) { all: runtests - runtests: cout$(EXEEXT) + runtests: cout " @echo "Testing cout" " ./cout -v < c.gperf > cout.out " -diff -b c.exp cout.out" - - endif # CROSS-COMPILE } GPERF_Files { @@ -31,12 +29,10 @@ project(adainset): gperf_test { verbatim(gnuace, bottom) { all: runtests - runtests: aout$(EXEEXT) + runtests: aout " @echo "Testing aout" " ./aout -v < ada.gperf > aout.out " -diff -b ada-res.exp aout.out" - - endif # CROSS-COMPILE } GPERF_Files { @@ -55,12 +51,10 @@ project(cppinset): gperf_test { verbatim(gnuace, bottom) { all: runtests - runtests: cppout$(EXEEXT) + runtests: cppout " @echo "Testing cppout" " ./cppout -v < cpp.gperf > cppout.out " -diff -b cpp-res.exp cppout.out" - - endif # CROSS-COMPILE } GPERF_Files { @@ -79,12 +73,10 @@ project(preinset): gperf_test { verbatim(gnuace, bottom) { all: runtests - runtests: preout$(EXEEXT) + runtests: preout " @echo "Testing preout" " ./preout -v < adadefs.gperf > preout.out " -diff -b ada-pred.exp preout.out" - - endif # CROSS-COMPILE } GPERF_Files { @@ -103,12 +95,10 @@ project(m3inset): gperf_test { verbatim(gnuace, bottom) { all: runtests - runtests: m3out$(EXEEXT) + runtests: m3out " @echo "Testing m3out" " ./m3out -v < modula3.gperf > m3out.out " -diff -b modula.exp m3out.out" - - endif # CROSS-COMPILE } GPERF_Files { @@ -127,12 +117,10 @@ project(pinset): gperf_test { verbatim(gnuace, bottom) { all: runtests - runtests: pout$(EXEEXT) + runtests: pout " @echo "Testing pout" " ./pout -v < pascal.gperf > pout.out " -diff -b pascal.exp pout.out" - - endif # CROSS-COMPILE } GPERF_Files { @@ -151,12 +139,10 @@ project(iinset): gperf_test { verbatim(gnuace, bottom) { all: runtests - runtests: iout$(EXEEXT) + runtests: iout " @echo "Testing iout" " ./iout -v < idl.gperf > iout.out " -diff -b idl.exp iout.out" - - endif # CROSS-COMPILE } GPERF_Files { @@ -176,12 +162,10 @@ project(iinset2): gperf_test { verbatim(gnuace, bottom) { all: runtests - runtests: iout2$(EXEEXT) + runtests: iout2 " @echo "Testing iout2" " ./iout2 -v < idl.gperf > iout2.out " -diff -b idl.exp iout2.out" - - endif # CROSS-COMPILE } GPERF_Files { @@ -200,12 +184,10 @@ project(tinset): gperf_test { verbatim(gnuace, bottom) { all: runtests - runtests: tout$(EXEEXT) + runtests: tout " @echo "Testing tout" " ./tout -v < corba.gperf > tout.out " -diff -b corba.exp tout.out" - - endif # CROSS-COMPILE } GPERF_Files { @@ -224,12 +206,10 @@ project(taoinset): gperf_test { verbatim(gnuace, bottom) { all: runtests - runtests: taoout$(EXEEXT) + runtests: taoout " @echo "Testing taoout" " ./taoout -v < tao.gperf > taoout.out " -diff -b tao.exp taoout.out" - - endif # CROSS-COMPILE } GPERF_Files { |