Mercurial > hg > xemacs-beta
comparison src/emacs.c @ 5827:4d7032d36975
Allow building --without-tls on the Windows native platform
author | Vin Shelton <acs@xemacs.org> |
---|---|
date | Mon, 10 Nov 2014 13:43:46 -0500 |
parents | a216b3c2b09e |
children | e2fae7783046 |
comparison
equal
deleted
inserted
replaced
5826:98681721a588 | 5827:4d7032d36975 |
---|---|
1604 syms_of_syntax (); | 1604 syms_of_syntax (); |
1605 #ifdef HAVE_SCROLLBARS | 1605 #ifdef HAVE_SCROLLBARS |
1606 syms_of_scrollbar (); | 1606 syms_of_scrollbar (); |
1607 #endif | 1607 #endif |
1608 syms_of_text (); | 1608 syms_of_text (); |
1609 #ifdef WITH_TLS | |
1609 syms_of_tls (); | 1610 syms_of_tls (); |
1611 #endif | |
1610 #ifdef HAVE_TOOLBARS | 1612 #ifdef HAVE_TOOLBARS |
1611 syms_of_toolbar (); | 1613 syms_of_toolbar (); |
1612 #endif | 1614 #endif |
1613 syms_of_undo (); | 1615 syms_of_undo (); |
1614 syms_of_widget (); | 1616 syms_of_widget (); |
2215 vars_of_select (); | 2217 vars_of_select (); |
2216 vars_of_sound (); | 2218 vars_of_sound (); |
2217 vars_of_symbols (); | 2219 vars_of_symbols (); |
2218 vars_of_syntax (); | 2220 vars_of_syntax (); |
2219 vars_of_text (); | 2221 vars_of_text (); |
2222 #ifdef WITH_TLS | |
2220 vars_of_tls (); | 2223 vars_of_tls (); |
2224 #endif | |
2221 #ifdef HAVE_TOOLBARS | 2225 #ifdef HAVE_TOOLBARS |
2222 vars_of_toolbar (); | 2226 vars_of_toolbar (); |
2223 #endif | 2227 #endif |
2224 vars_of_undo (); | 2228 vars_of_undo (); |
2225 vars_of_window (); | 2229 vars_of_window (); |
2678 #endif | 2682 #endif |
2679 #ifdef HAVE_TTY | 2683 #ifdef HAVE_TTY |
2680 init_device_tty (); | 2684 init_device_tty (); |
2681 #endif | 2685 #endif |
2682 init_console_stream (restart); /* Create the first console */ | 2686 init_console_stream (restart); /* Create the first console */ |
2687 #ifdef WITH_TLS | |
2683 if (initialized && !restart) | 2688 if (initialized && !restart) |
2684 init_tls (); | 2689 init_tls (); |
2690 #endif | |
2685 | 2691 |
2686 /* try to get the actual pathname of the exec file we are running */ | 2692 /* try to get the actual pathname of the exec file we are running */ |
2687 if (!restart) | 2693 if (!restart) |
2688 { | 2694 { |
2689 Vinvocation_name = Fcar (Vcommand_line_args); | 2695 Vinvocation_name = Fcar (Vcommand_line_args); |