Tera TermRevision: 7291
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7291
Author: zmatsuo
Date: 2018-12-01 01:28:38 +0900 (Sat, 01 Dec 2018)
Log Message:
-----------
extern "C" 削除
Modified Paths:
--------------
trunk/teraterm/teraterm/filesys.cpp
trunk/teraterm/teraterm/teraprn.cpp
trunk/teraterm/teraterm/vtwin.cpp
-------------- next part --------------
Modified: trunk/teraterm/teraterm/filesys.cpp
===================================================================
--- trunk/teraterm/teraterm/filesys.cpp 2018-11-30 16:28:25 UTC (rev 7290)
+++ trunk/teraterm/teraterm/filesys.cpp 2018-11-30 16:28:38 UTC (rev 7291)
@@ -1,6 +1,6 @@
/*
* Copyright (C) 1994-1998 T. Teranishi
- * (C) 2005-2017 TeraTerm Project
+ * (C) 2005-2018 TeraTerm Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -503,7 +503,6 @@
}
-extern "C" {
BOOL LogStart()
{
LONG Option;
@@ -769,7 +768,6 @@
return TRUE;
}
-}
void LogPut1(BYTE b)
{
@@ -1176,7 +1174,6 @@
cv.BCount = 0;
}
-extern "C" {
void FileSendStart()
{
LONG Option = 0;
@@ -1244,7 +1241,6 @@
if (! OpenFTDlg(SendVar))
FileTransEnd(OpSendFile);
- }
}
void FileTransEnd(WORD OpId)
@@ -1302,7 +1298,6 @@
return CommTextEcho(&cv,(PCHAR)&b,1);
}
-extern "C" {
// \x88ȉ\xBA\x82̎\x9E\x82͂\xB1\x82\xBF\x82\xE7\x82̊\x94\x82\xF0\x8Eg\x82\xA4
// - BinaryMode == true
// - FileBracketMode == false
@@ -1363,9 +1358,7 @@
FileTransEnd(OpSendFile);
}
-}
-extern "C" {
void FileSend()
{
WORD c, fc;
@@ -1469,23 +1462,18 @@
FileTransEnd(OpSendFile);
}
-}
-extern "C" {
void FLogChangeButton(BOOL Pause)
{
if (FLogDlg!=NULL)
FLogDlg->ChangeButton(Pause);
}
-}
-extern "C" {
void FLogRefreshNum()
{
if (FLogDlg!=NULL)
FLogDlg->RefreshNum();
}
-}
BOOL OpenProtoDlg(PFileVar fv, int IdProto, int Mode, WORD Opt1, WORD Opt2)
{
@@ -1581,7 +1569,6 @@
return TRUE;
}
-extern "C" {
void CloseProtoDlg()
{
if (PtDlg!=NULL)
@@ -1603,7 +1590,6 @@
}
}
}
-}
BOOL ProtoStart()
{
@@ -1649,7 +1635,6 @@
FreeFileVar(&FileVar);
}
-extern "C" {
int ProtoDlgParse()
{
int P;
@@ -1666,17 +1651,13 @@
}
return P;
}
-}
-extern "C" {
void ProtoDlgTimeOut()
{
if (PtDlg!=NULL)
(*ProtoTimeOutProc)(ProtoId,FileVar,ProtoVar,&cv);
}
-}
-extern "C" {
void ProtoDlgCancel()
{
if ((PtDlg!=NULL) &&
@@ -1683,9 +1664,7 @@
(*ProtoCancel)(ProtoId,FileVar,ProtoVar,&cv))
ProtoEnd();
}
-}
-extern "C" {
void KermitStart(int mode)
{
WORD w;
@@ -1740,9 +1719,7 @@
if (! OpenProtoDlg(FileVar,PROTO_KMT,mode,0,0))
ProtoEnd();
}
-}
-extern "C" {
void XMODEMStart(int mode)
{
LONG Option;
@@ -1827,9 +1804,7 @@
ts.XmodemOpt,ts.XmodemBin))
ProtoEnd();
}
-}
-extern "C" {
void YMODEMStart(int mode)
{
WORD Opt;
@@ -1871,9 +1846,7 @@
if (! OpenProtoDlg(FileVar,PROTO_YM,mode,Opt,0))
ProtoEnd();
}
-}
-extern "C" {
void ZMODEMStart(int mode)
{
WORD Opt;
@@ -1912,9 +1885,7 @@
if (! OpenProtoDlg(FileVar,PROTO_ZM,mode,Opt,0))
ProtoEnd();
}
-}
-extern "C" {
void BPStart(int mode)
{
LONG Option = 0;
@@ -1947,9 +1918,7 @@
if (! OpenProtoDlg(FileVar,PROTO_BP,mode,0,0))
ProtoEnd();
}
-}
-extern "C" {
void QVStart(int mode)
{
WORD W;
@@ -1983,4 +1952,3 @@
if (! OpenProtoDlg(FileVar,PROTO_QV,mode,0,0))
ProtoEnd();
}
-}
Modified: trunk/teraterm/teraterm/teraprn.cpp
===================================================================
--- trunk/teraterm/teraterm/teraprn.cpp 2018-11-30 16:28:25 UTC (rev 7290)
+++ trunk/teraterm/teraterm/teraprn.cpp 2018-11-30 16:28:38 UTC (rev 7291)
@@ -96,7 +96,6 @@
}
}
-extern "C" {
HDC PrnBox(HWND HWin, PBOOL Sel)
{
/* initialize PrnDlg record */
@@ -122,9 +121,7 @@
*Sel = (PrnDlg.Flags & PD_SELECTION) != 0;
return PrintDC;
}
-}
-extern "C" {
BOOL PrnStart(LPSTR DocumentName)
{
DOCINFO Doc;
@@ -167,9 +164,7 @@
}
return Printing;
}
-}
-extern "C" {
void PrnStop()
{
if (Printing) {
@@ -183,9 +178,7 @@
HPrnAbortDlg = NULL;
}
}
-}
-extern "C" {
int VTPrintInit(int PrnFlag)
// Initialize printing of VT window
// PrnFlag: specifies object to be printed
@@ -350,8 +343,7 @@
return (IdPrnScreen);
}
}
-}
-extern "C" {
+
void PrnSetAttr(TCharAttr Attr)
// Set text attribute of printing
//
@@ -368,9 +360,7 @@
SetBkColor( PrintDC,White);
}
}
-}
-extern "C" {
void PrnOutText(PCHAR Buff, int Count)
// Print out text
// Buff: points text buffer
@@ -445,9 +435,7 @@
} while (Count>0);
}
-}
-extern "C" {
void PrnNewLine()
// Moves to the next line in printing
{
@@ -454,9 +442,7 @@
PrnX = Margin.left;
PrnY = PrnY + PrnFH;
}
-}
-extern "C" {
void VTPrintEnd()
{
int i, j;
@@ -477,10 +463,8 @@
PrnStop();
return;
}
-}
/* printer emulation routines */
-extern "C" {
void OpenPrnFile()
{
char Temp[MAX_PATH];
@@ -506,7 +490,6 @@
_llseek(HPrnFile,0,2);
}
}
-}
void PrintFile()
{
@@ -661,7 +644,6 @@
}
}
-extern "C" {
void ClosePrnFile()
{
PrnBuffCount = 0;
@@ -671,9 +653,7 @@
HPrnFile = INVALID_HANDLE_VALUE;
SetTimer(HVTWin,IdPrnStartTimer,ts.PassThruDelay*1000,NULL);
}
-}
-extern "C" {
void WriteToPrnFile(BYTE b, BOOL Write)
// (b,Write) =
// (0,FALSE): clear buffer
@@ -694,4 +674,3 @@
PrnBuffCount = 0;
}
}
-}
Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp 2018-11-30 16:28:25 UTC (rev 7290)
+++ trunk/teraterm/teraterm/vtwin.cpp 2018-11-30 16:28:38 UTC (rev 7291)
@@ -5532,7 +5532,6 @@
* \x91S Tera Term \x82փ\x81\x83b\x83Z\x81[\x83W\x82𑗐M\x82\xB7\x82\xE9\x83u\x83\x8D\x81[\x83h\x83L\x83\x83\x83X\x83g\x83\x82\x81[\x83h\x81B
* "sendbroadcast"\x83}\x83N\x83\x8D\x83R\x83}\x83\x93\x83h\x82\xA9\x82\xE7\x82̂ݗ\x98\x97p\x82\xB3\x82\xEA\x82\xE9\x81B
*/
-extern "C"
void SendBroadcastMessage(HWND HVTWin, HWND hWnd, char *buf, int buflen)
{
int i, count;
@@ -5562,7 +5561,6 @@
* \x83u\x83\x8D\x81[\x83h\x83L\x83\x83\x83X\x83g\x91\x97\x90M\x82\xF0\x8Ds\x82\xA2\x81A\x8E\xF3\x90M\x91\xA4\x82Ń\x81\x83b\x83Z\x81[\x83W\x82\xF0\x8E\xE6\x8ȆI\x91\xF0\x82\xB7\x82\xE9\x81B
* "sendmulticast"\x83}\x83N\x83\x8D\x83R\x83}\x83\x93\x83h\x82\xA9\x82\xE7\x82̂ݗ\x98\x97p\x82\xB3\x82\xEA\x82\xE9\x81B
*/
-extern "C"
void SendMulticastMessage(HWND HVTWin, HWND hWnd, char *name, char *buf, int buflen)
{
int i, count;
@@ -5609,7 +5607,6 @@
free(msg);
}
-extern "C"
void SetMulticastName(char *name)
{
strncpy_s(ts.MulticastName, sizeof(ts.MulticastName), name, _TRUNCATE);