Mercurial > hg > xemacs-beta
annotate netinstall/net.cc @ 4932:8b63e21b0436
fix compile issues with gcc 4
-------------------- ChangeLog entries follow: --------------------
ChangeLog addition:
2010-01-24 Ben Wing <ben@xemacs.org>
* aclocal.m4 (XE_SHLIB_STUFF):
Use -export-all-symbols instead of -export-dynamic on PE targets
(Cygwin and MinGW).
* configure.ac (XE_EXPAND_VARIABLE):
* configure.ac (TAB):
Create variable XEMACS_CC_GPP to check whether we're running g++.
Don't just check for an executable called `g++' -- it might be
called g++-4 or whatever. Instead, check for either named `g++*'
or claiming to be g++ when called with --version. Rewrite code do
use the variable.
Add -fno-strict-aliasing to optimization flags when GCC and
optimized, and in all cases with g++, since under these circumstances
strict aliasing is otherwise assumed, and XEmacs can't easily be
made to respect its restrictions.
* configure: Regenerate.
lib-src/ChangeLog addition:
2010-01-24 Ben Wing <ben@xemacs.org>
* fakemail.c (args_size):
* fakemail.c (parse_header):
* ootags.c (C_entries):
Fix warnings about possible use of uninitialized vars.
lwlib/ChangeLog addition:
2010-01-24 Ben Wing <ben@xemacs.org>
* xlwgauge.c (GaugeResize):
* xlwgauge.c (GaugeSize):
Fix warnings about possible use of uninitialized vars.
modules/ChangeLog addition:
2010-01-24 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c (CHECK_LIVE_CONNECTION):
* postgresql/postgresql.c (print_pgconn):
* postgresql/postgresql.c (Fpq_connectdb):
* postgresql/postgresql.c (Fpq_connect_start):
* postgresql/postgresql.c (Fpq_exec):
* postgresql/postgresql.c (Fpq_get_result):
Fix g++ 4.3 complaints about implicit conversions of string
literals (const char *) to char *.
src/ChangeLog addition:
2010-01-24 Ben Wing <ben@xemacs.org>
* chartab.c (decode_char_table_range):
* extents.c (extent_fragment_update):
* objects-msw.c (initialize_font_instance):
* process.c (Fgetenv):
* redisplay-output.c (get_next_display_block):
Fix warnings about possible use of uninitialized vars.
* compiler.h:
* compiler.h (REGISTER):
* event-stream.c (is_scrollbar_event):
* window.c (window_scrollbar_width):
* window.c (window_scrollbar_height):
* window.c (window_left_window_gutter_width):
* window.c (window_right_window_gutter_width):
Add USED_IF_SCROLLBARS. Use it to fix warnings about unused
vars when --with-scrollbars=no.
* config.h.in:
Change comment to explain better why DECLARE_INLINE_HEADER
is needed.
* dialog-msw.c:
* emacs.c (SHEBANG_EXE_PROGNAME_LENGTH):
* emacs.c (main_1):
* event-msw.c (struct mswin_message_debug):
* event-msw.c (debug_output_mswin_message):
* font-mgr.c:
* font-mgr.c (Ffc_config_filename):
* glyphs-msw.c (struct):
* glyphs-msw.c (bitmap_table):
* glyphs-x.c (update_widget_face):
* intl-win32.c (struct lang_to_string):
* intl-win32.c (lang_to_string_table):
* nas.c:
* objects-xlike-inc.c:
* objects-xlike-inc.c (xft_find_charset_font):
* syswindows.h:
* win32.c (mswindows_output_last_error):
Fix g++ 4.3 complaints about implicit conversions of string
literals (const char *) to char *.
* lisp.h:
G++ 4.3 needs #include <limits> to avoid errors about min/max.
* lisp.h (disabled_assert_with_message):
Use disabled_assert* whenever asserts are disabled. Rewrite
disabled_assert* to avoid complaints about unused vars by
pretending to use the vars but casting them to (void).
Remove code that defined assert() weirdly if DEBUG_XEMACS but
not USE_ASSERTIONS -- configure sets USE_ASSERTIONS automatically
when DEBUG_XEMACS, and if the user has forced it off, then
so be it.
* lisp.h (SYMBOL_KEYWORD):
Put some of the combined `extern Lisp_Object's back under
the file they are declared in. Cosmetic fix.
* number.h:
Remove `extern Lisp_Object' decls that duplicate lisp.h,
since they have different C vs. C++ linkage.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Sun, 24 Jan 2010 22:04:58 -0600 |
| parents | 685b588e92d8 |
| children |
| rev | line source |
|---|---|
| 448 | 1 /* |
| 2 * Copyright (c) 2000, Red Hat, Inc. | |
| 3 * | |
| 4 * This program is free software; you can redistribute it and/or modify | |
| 5 * it under the terms of the GNU General Public License as published by | |
| 6 * the Free Software Foundation; either version 2 of the License, or | |
| 7 * (at your option) any later version. | |
| 8 * | |
| 9 * A copy of the GNU General Public License can be found at | |
| 10 * http://www.gnu.org/ | |
| 11 * | |
| 12 * Written by DJ Delorie <dj@cygnus.com> | |
| 13 * | |
| 673 | 14 * Sync'ed with cinstall 2001-10-16 |
| 448 | 15 */ |
| 16 | |
| 17 /* The purpose of this file is to get the network configuration | |
| 18 information from the user. */ | |
| 19 | |
| 20 #include "win32.h" | |
| 21 #include <stdio.h> | |
| 22 #include <stdlib.h> | |
| 23 #include "dialog.h" | |
| 24 #include "resource.h" | |
| 25 #include "state.h" | |
| 26 #include "msg.h" | |
| 27 #include "log.h" | |
| 28 | |
| 29 static int rb[] = { IDC_NET_IE5, IDC_NET_DIRECT, IDC_NET_PROXY, 0 }; | |
| 30 | |
| 31 static void | |
| 32 check_if_enable_next (HWND h) | |
| 33 { | |
| 34 int e = 0, p = 0, pu = 0; | |
| 35 if (net_method == IDC_NET_IE5) | |
| 36 pu = 1; | |
| 37 if (net_method == IDC_NET_IE5 || net_method == IDC_NET_DIRECT) | |
| 38 e = 1; | |
| 39 else if (net_method == IDC_NET_PROXY) | |
| 40 { | |
| 41 p = pu = 1; | |
| 42 if (net_proxy_host && net_proxy_port) | |
| 43 e = 1; | |
| 44 } | |
| 45 EnableWindow (GetDlgItem (h, IDOK), e); | |
| 46 EnableWindow (GetDlgItem (h, IDC_PROXY_HOST), p); | |
| 47 EnableWindow (GetDlgItem (h, IDC_PROXY_PORT), p); | |
| 48 } | |
| 49 | |
| 50 static void | |
| 51 load_dialog (HWND h) | |
| 52 { | |
| 53 rbset (h, rb, net_method); | |
| 54 eset (h, IDC_PROXY_HOST, net_proxy_host); | |
| 55 if (net_proxy_port == 0) | |
| 56 net_proxy_port = 80; | |
| 57 eset (h, IDC_PROXY_PORT, net_proxy_port); | |
| 58 check_if_enable_next (h); | |
| 59 } | |
| 60 | |
| 61 static void | |
| 62 save_dialog (HWND h) | |
| 63 { | |
| 64 net_method = rbget (h, rb); | |
| 65 net_proxy_host = eget (h, IDC_PROXY_HOST, net_proxy_host); | |
| 66 net_proxy_port = eget (h, IDC_PROXY_PORT); | |
| 67 } | |
| 68 | |
| 69 static BOOL | |
| 70 dialog_cmd (HWND h, int id, HWND hwndctl, UINT code) | |
| 71 { | |
| 72 switch (id) | |
| 73 { | |
| 74 | |
| 75 case IDC_NET_IE5: | |
| 76 case IDC_NET_DIRECT: | |
| 77 case IDC_NET_PROXY: | |
| 78 case IDC_PROXY_HOST: | |
| 79 case IDC_PROXY_PORT: | |
| 80 save_dialog (h); | |
| 81 check_if_enable_next (h); | |
| 82 break; | |
| 83 | |
| 84 case IDOK: | |
| 85 save_dialog (h); | |
| 86 switch (source) | |
| 87 { | |
| 88 case IDC_SOURCE_NETINST: | |
| 89 case IDC_SOURCE_DOWNLOAD: | |
| 90 NEXT (IDD_SITE); | |
| 91 break; | |
| 92 case IDC_SOURCE_CWD: | |
| 93 NEXT (0); | |
| 94 break; | |
| 95 default: | |
| 96 msg ("source is default? %d\n", source); | |
| 97 NEXT (0); | |
| 98 } | |
| 99 break; | |
| 100 | |
| 101 case IDC_BACK: | |
| 102 save_dialog (h); | |
| 103 switch (source) | |
| 104 { | |
| 105 case IDC_SOURCE_DOWNLOAD: | |
| 106 NEXT (IDD_LOCAL_DIR); | |
| 107 break; | |
| 108 case IDC_SOURCE_NETINST: | |
| 109 case IDC_SOURCE_CWD: | |
| 110 NEXT (IDD_ROOT); | |
| 111 break; | |
| 112 } | |
| 113 break; | |
| 114 | |
| 115 case IDCANCEL: | |
| 116 NEXT (0); | |
| 117 break; | |
| 118 } | |
| 119 } | |
| 120 | |
| 121 static BOOL CALLBACK | |
| 122 dialog_proc (HWND h, UINT message, WPARAM wParam, LPARAM lParam) | |
| 123 { | |
| 124 switch (message) | |
| 125 { | |
| 126 case WM_INITDIALOG: | |
| 127 load_dialog (h); | |
| 673 | 128 |
| 129 // Check to see if any radio buttons are selected. If not, select a default. | |
| 130 if ((!SendMessage(GetDlgItem (h, IDC_NET_IE5), BM_GETCHECK, 0, 0) == BST_CHECKED) | |
| 131 && (!SendMessage(GetDlgItem (h, IDC_NET_PROXY), BM_GETCHECK, 0, 0) == BST_CHECKED)) | |
| 132 { | |
| 133 SendMessage(GetDlgItem (h, IDC_NET_DIRECT), BM_CLICK, 0, 0); | |
| 134 } | |
| 448 | 135 return FALSE; |
| 136 case WM_COMMAND: | |
| 137 return HANDLE_WM_COMMAND (h, wParam, lParam, dialog_cmd); | |
| 138 } | |
| 139 return FALSE; | |
| 140 } | |
| 141 | |
| 142 void | |
| 143 do_net (HINSTANCE h) | |
| 144 { | |
| 145 int rv = 0; | |
| 146 | |
| 673 | 147 net_method = IDC_NET_DIRECT; |
| 448 | 148 rv = DialogBox (h, MAKEINTRESOURCE (IDD_NET), 0, dialog_proc); |
| 149 if (rv == -1) | |
| 150 fatal (IDS_DIALOG_FAILED); | |
| 151 | |
| 152 log (0, "net: %s", | |
| 153 (net_method == IDC_NET_IE5) ? "IE5" : | |
| 154 (net_method == IDC_NET_DIRECT) ? "Direct" : "Proxy"); | |
| 155 } | |
| 156 |