comparison src/emacs.c @ 259:11cf20601dec r20-5b28

Import from CVS: tag r20-5b28
author cvs
date Mon, 13 Aug 2007 10:23:02 +0200
parents 65c19d2020f7
children 727739f917cb
comparison
equal deleted inserted replaced
258:58424f6abf56 259:11cf20601dec
939 939
940 #ifdef MULE 940 #ifdef MULE
941 syms_of_mule (); 941 syms_of_mule ();
942 syms_of_mule_ccl (); 942 syms_of_mule_ccl ();
943 syms_of_mule_charset (); 943 syms_of_mule_charset ();
944 #endif
945 #ifdef FILE_CODING
944 syms_of_mule_coding (); 946 syms_of_mule_coding ();
947 #endif
948 #ifdef MULE
945 #ifdef HAVE_WNN 949 #ifdef HAVE_WNN
946 syms_of_mule_wnn (); 950 syms_of_mule_wnn ();
947 #endif 951 #endif
948 #ifdef HAVE_CANNA 952 #ifdef HAVE_CANNA
949 syms_of_mule_canna (); 953 syms_of_mule_canna ();
972 syms_of_tooltalk (); 976 syms_of_tooltalk ();
973 #endif 977 #endif
974 978
975 #ifdef SUNPRO 979 #ifdef SUNPRO
976 syms_of_sunpro (); 980 syms_of_sunpro ();
981 #endif
982
983 #ifdef HAVE_LDAP
984 syms_of_eldap ();
977 #endif 985 #endif
978 986
979 /* Now create the subtypes for the types that have them. 987 /* Now create the subtypes for the types that have them.
980 We do this before the vars_*() because more symbols 988 We do this before the vars_*() because more symbols
981 may get initialized here. */ 989 may get initialized here. */
1091 LSTREAM_HAS_METHOD() 1099 LSTREAM_HAS_METHOD()
1092 1100
1093 */ 1101 */
1094 1102
1095 lstream_type_create (); 1103 lstream_type_create ();
1096 #ifdef MULE 1104 #ifdef FILE_CODING
1097 lstream_type_create_mule_coding (); 1105 lstream_type_create_mule_coding ();
1098 #endif 1106 #endif
1099 lstream_type_create_print (); 1107 lstream_type_create_print ();
1100 1108
1101 /* Now initialize most variables. 1109 /* Now initialize most variables.
1277 #endif 1285 #endif
1278 1286
1279 #ifdef MULE 1287 #ifdef MULE
1280 vars_of_mule (); 1288 vars_of_mule ();
1281 vars_of_mule_charset (); 1289 vars_of_mule_charset ();
1290 #endif
1291 #ifdef FILE_CODING
1282 vars_of_mule_coding (); 1292 vars_of_mule_coding ();
1293 #endif
1294 #ifdef MULE
1283 #ifdef HAVE_WNN 1295 #ifdef HAVE_WNN
1284 vars_of_mule_wnn (); 1296 vars_of_mule_wnn ();
1285 #endif 1297 #endif
1286 #ifdef HAVE_CANNA 1298 #ifdef HAVE_CANNA
1287 vars_of_mule_canna (); 1299 vars_of_mule_canna ();
1292 vars_of_tooltalk (); 1304 vars_of_tooltalk ();
1293 #endif 1305 #endif
1294 1306
1295 #ifdef SUNPRO 1307 #ifdef SUNPRO
1296 vars_of_sunpro (); 1308 vars_of_sunpro ();
1309 #endif
1310
1311 #ifdef HAVE_LDAP
1312 vars_of_eldap ();
1297 #endif 1313 #endif
1298 1314
1299 /* Now initialize any specifier variables. We do this later 1315 /* Now initialize any specifier variables. We do this later
1300 because it has some dependence on the vars initialized 1316 because it has some dependence on the vars initialized
1301 above. 1317 above.
1341 1357
1342 #ifdef MULE 1358 #ifdef MULE
1343 /* These two depend on hashtables and various variables declared 1359 /* These two depend on hashtables and various variables declared
1344 earlier. The second may also depend on the first. */ 1360 earlier. The second may also depend on the first. */
1345 complex_vars_of_mule_charset (); 1361 complex_vars_of_mule_charset ();
1362 #endif
1363 #if defined(FILE_CODING)
1346 complex_vars_of_mule_coding (); 1364 complex_vars_of_mule_coding ();
1347 #endif 1365 #endif
1348 1366
1349 /* This calls allocate_glyph(), which creates specifiers 1367 /* This calls allocate_glyph(), which creates specifiers
1350 and also relies on a variable (Vthe_nothing_vector) initialized 1368 and also relies on a variable (Vthe_nothing_vector) initialized
1784 This will "restart" emacs with the specified command-line arguments. 1802 This will "restart" emacs with the specified command-line arguments.
1785 */ 1803 */
1786 (int nargs, Lisp_Object *args)) 1804 (int nargs, Lisp_Object *args))
1787 { 1805 {
1788 int ac; 1806 int ac;
1789 Extbyte *wampum; 1807 CONST Extbyte *wampum;
1790 int namesize; 1808 int namesize;
1791 int total_len; 1809 int total_len;
1792 Lisp_Object orig_invoc_name = Fcar (Vcommand_line_args); 1810 Lisp_Object orig_invoc_name = Fcar (Vcommand_line_args);
1793 Extbyte **wampum_all = alloca_array (Extbyte *, nargs); 1811 CONST Extbyte **wampum_all = alloca_array (CONST Extbyte *, nargs);
1794 int *wampum_all_len = alloca_array (int, nargs); 1812 int *wampum_all_len = alloca_array (int, nargs);
1795 1813
1796 assert (!gc_in_progress); 1814 assert (!gc_in_progress);
1797 1815
1798 if (run_temacs_argc < 0) 1816 if (run_temacs_argc < 0)
1934 { 1952 {
1935 malloc_set_state (malloc_state_ptr); 1953 malloc_set_state (malloc_state_ptr);
1936 #if 0 1954 #if 0
1937 free (malloc_state_ptr); 1955 free (malloc_state_ptr);
1938 #endif 1956 #endif
1939 #if !defined(MULE) && !defined(DEBUG_DOUG_LEA_MALLOC) 1957 /* mmap works in glibc-2.1, glibc-2.0 (Non-Mule only) and Linux libc5 */
1958 #if (defined(__GLIBC__) && __GLIBC_MINOR__ >= 1) || \
1959 defined(_NO_MALLOC_WARNING_) || \
1960 (defined(__GLIBC__) && __GLIBC_MINOR__ < 1 && !defined(MULE)) || \
1961 defined(DEBUG_DOUG_LEA_MALLOC)
1940 mallopt (M_MMAP_MAX, 64); 1962 mallopt (M_MMAP_MAX, 64);
1941 #endif 1963 #endif
1942 #ifdef REL_ALLOC 1964 #ifdef REL_ALLOC
1943 r_alloc_reinit (); 1965 r_alloc_reinit ();
1944 #endif 1966 #endif