現在のBCC++向けMakefile.bccの警告設定で残っていた警告のうち, 変数未使

用などで除去可能なものを除去.

diff --git a/src/chuukei.c b/src/chuukei.c
index a2d9034..e16ef4f 100644 (file)
--- a/src/chuukei.c
+++ b/src/chuukei.c
@@ -168,11 +168,9 @@ void flush_ringbuf(void)
        while (1)
        {
                fd_set tmp_fdset;
-               struct timeval tmp_tv;
                int result;
 
                tmp_fdset = fdset;
-               tmp_tv = tv;
 
                /* ¥½¥±¥Ã¥È¤Ë¥Ç¡¼¥¿¤ò½ñ¤­¹þ¤á¤ë¤«¤É¤¦¤«Ä´¤Ù¤ë */
                select(sd+1, (fd_set *)NULL, &tmp_fdset, (fd_set *)NULL, &tv);

diff --git a/src/inet.c b/src/inet.c
index eb75548..490e64f 100644 (file)
--- a/src/inet.c
+++ b/src/inet.c
@@ -292,9 +292,12 @@ static int connect_server(int timeout, const char *host, int port)
        }
        sig_int_saved = signal(SIGINT, interrupt_report);
        sig_alm_saved = signal(SIGALRM, interrupt_report);
-    
+
        /* ¥¿¥¤¥à¥¢¥¦¥È¤Î»þ´Ö¤òÀßÄê */
        setitimer(ITIMER_REAL, &val, NULL);
+#else
+       /* Unused in Windows */
+       (void)timeout;
 #endif
 
        /* ¥×¥í¥­¥·¤¬ÀßÄꤵ¤ì¤Æ¤¤¤ì¤Ð¥×¥í¥­¥·¤Ë·Ò¤° */

diff --git a/src/main-win.c b/src/main-win.c
index 994ebd3..e6c82cd 100644 (file)
--- a/src/main-win.c
+++ b/src/main-win.c
@@ -1656,7 +1656,16 @@ static errr term_force_font(term_data *td, cptr path)
        /* Forget the old font (if needed) */
        if (td->font_id) DeleteObject(td->font_id);
 
-#ifndef JP
+#ifdef JP
+       /* Unused */
+       (void)path;
+
+       /* Create the font (using the 'base' of the font file name!) */
+       td->font_id = CreateFontIndirect(&(td->lf));
+       wid = td->lf.lfWidth;
+       hgt = td->lf.lfHeight;
+       if (!td->font_id) return (1);
+#else
        /* Forget old font */
        if (td->font_file)
        {
@@ -1687,11 +1696,9 @@ static errr term_force_font(term_data *td, cptr path)
                td->font_file = NULL;
        }
 
-
        /* No path given */
        if (!path) return (1);
 
-
        /* Local copy */
        strcpy(buf, path);
 
@@ -1712,22 +1719,14 @@ static errr term_force_font(term_data *td, cptr path)
 
        /* Remove the "suffix" */
        base[strlen(base)-4] = '\0';
-#endif
 
        /* Create the font (using the 'base' of the font file name!) */
-#ifdef JP
-       td->font_id = CreateFontIndirect(&(td->lf));
-       wid = td->lf.lfWidth;
-       hgt = td->lf.lfHeight;
-       if (!td->font_id) return (1);
-#else
        td->font_id = CreateFont(hgt, wid, 0, 0, FW_DONTCARE, 0, 0, 0,
                                 ANSI_CHARSET, OUT_DEFAULT_PRECIS,
                                 CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY,
                                 FIXED_PITCH | FF_DONTCARE, base);
 #endif
 
-
        /* Hack -- Unknown size */
        if (!wid || !hgt)
        {
@@ -1907,6 +1906,9 @@ static void Term_nuke_win(term *t)
  */
 static errr Term_user_win(int n)
 {
+       /* Unused */
+       (void)n;
+
        /* Success */
        return (0);
 }
@@ -5059,6 +5061,9 @@ int FAR PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrevInst,
        HDC hdc;
        MSG msg;
 
+       /* Unused */
+       (void)nCmdShow;
+
        /* Save globally */
        hInstance = hInst;