git-svn-id:...

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@52247 954022d7-b5bf-4e40-9824-e11837661b57

Common/AVSUtils.h → Common/ASCUtils.h

@@ -10,7 +10,7 @@
 #include <atlcoll.h>
 #include <stdio.h>
 
-#include "AVSUtilsDefines.h"
+#include "ASCUtilsDefines.h"
 
 #define ADDREFINTERFACE(pinterface)\
 {\

Common/AVSUtilsDefines.h → Common/ASCUtilsDefines.h

@@ -2,8 +2,8 @@
 	#pragma once			// for MSVS
 #endif	// #ifdef _MSC_VER
 
-#ifndef _AVSUTILSDEFINES_H_	// For Borland compiler
-#define _AVSUTILSDEFINES_H_
+#ifndef _ASCUTILSDEFINES_H_	// For Borland compiler
+#define _ASCUTILSDEFINES_H_
 
 #define ACCURATE_SEEKMODE			0
 #define LEFTNEAREST_SEEKMODE		1
@@ -20,4 +20,4 @@
 #define	PROGRESSVIDEOFILE_INDEXING				3
 #define	PROGRESSVIDEOFILE_PARSING_VBRAUDIO		4
 
-#endif // #ifndef _AVSUTILSDEFINES_H_	// For Borland compiler
\ No newline at end of file
+#endif // #ifndef _ASCUTILSDEFINES_H_	// For Borland compiler
\ No newline at end of file

Common/DocxFormat/Source/Base/Base.h

@@ -52,7 +52,7 @@
 #include <atlstr.h>
 #include <atltypes.h>
 
-#include "AVSUtils.h"
+#include "..\..\..\ASCUtils.h"
 
 using namespace ATL;