Mercurial > hg > xemacs-beta
annotate src/s/sol2.h @ 4953:304aebb79cd3
function renamings to track names of char typedefs
-------------------- ChangeLog entries follow: --------------------
man/ChangeLog addition:
2010-01-27 Ben Wing <ben@xemacs.org>
* internals/internals.texi (lrecords):
* internals/internals.texi (The DFC API):
* internals/internals.texi (Conversion to and from External Data):
* internals/internals.texi (Mule-izing Code):
* internals/internals.texi (Pervasive changes throughout XEmacs sources):
* internals/internals.texi (Ben's README):
* internals/internals.texi (Future Work -- Localized Text/Messages):
* emodules.texi (Defining Variables):
Rename:
write_c_string -> write_cistring
build_intstring -> build_istring
build_string -> build_cistring
build_ext_string -> build_extstring
make_ext_string -> make_extstring
buffer_insert_c_string -> buffer_insert_ascstring
intern_int -> intern_istring
See comment in src/ChangeLog about this.
modules/ChangeLog addition:
2010-01-27 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c (print_pgconn):
* postgresql/postgresql.c (print_pgresult):
* postgresql/postgresql.c (Fpq_conn_defaults):
* postgresql/postgresql.c (Fpq_pgconn):
* postgresql/postgresql.c (Fpq_res_status):
* postgresql/postgresql.c (Fpq_result_error_message):
* postgresql/postgresql.c (Fpq_fname):
* postgresql/postgresql.c (Fpq_get_value):
* postgresql/postgresql.c (Fpq_cmd_status):
* postgresql/postgresql.c (Fpq_cmd_tuples):
* postgresql/postgresql.c (Fpq_notifies):
* postgresql/postgresql.c (Fpq_get_line):
* postgresql/postgresql.c (Fpq_get_line_async):
* postgresql/postgresql.c (FROB):
* postgresql/postgresql.c (init_postgresql_from_environment):
* ldap/eldap.c:
* ldap/eldap.c (Fldap_open):
* ldap/eldap.c (Fldap_search_basic):
* canna/canna_api.c:
* canna/canna_api.c (make_euc_string):
Rename:
write_c_string -> write_cistring
build_intstring -> build_istring
build_string -> build_cistring
build_ext_string -> build_extstring
make_ext_string -> make_extstring
buffer_insert_c_string -> buffer_insert_ascstring
intern_int -> intern_istring
See comment in src/ChangeLog about this.
src/ChangeLog addition:
2010-01-27 Ben Wing <ben@xemacs.org>
* .gdbinit.in.in:
* README:
* abbrev.c (write_abbrev):
* abbrev.c (describe_abbrev):
* alloc.c (make_extstring):
* alloc.c (build_istring):
* alloc.c (build_cistring):
* alloc.c (build_ascstring):
* alloc.c (build_extstring):
* alloc.c (build_msg_istring):
* alloc.c (build_defer_istring):
* buffer.c (Fgenerate_new_buffer_name):
* buffer.c (init_buffer_2):
* console-tty.c (tty_init_console):
* console-x.c (get_display_arg_connection):
* console-x.c (x_perhaps_init_unseen_key_defaults):
* database.c (dbm_map):
* database.c (dbm_get):
* database.c (berkdb_get):
* database.c (berkdb_map):
* device-gtk.c (FROB_PIXMAP):
* device-gtk.c (Fgtk_style_info):
* device-msw.c (msprinter_default_printer):
* device-msw.c (sync_printer_with_devmode):
* device-x.c (coding_system_of_xrm_database):
* device-x.c (x_init_device):
* device-x.c (signal_if_x_error):
* device-x.c (Fx_get_resource):
* device-x.c (Fx_server_vendor):
* device-x.c (Fx_get_font_path):
* dialog-x.c (maybe_run_dbox_text_callback):
* doc.c (extract_object_file_name):
* doc.c (unparesseuxify_doc_string):
* doc.c (get_doc_string):
* doc.c (get_object_file_name):
* doc.c (Fdocumentation):
* doc.c (Fsnarf_documentation):
* doc.c (Fsubstitute_command_keys):
* editfns.c (init_editfns):
* editfns.c (Ftemp_directory):
* editfns.c (Fuser_login_name):
* editfns.c (Fuser_real_login_name):
* editfns.c (Fuser_home_directory):
* editfns.c (Fformat_time_string):
* editfns.c (Fcurrent_time_string):
* editfns.c (Fcurrent_time_zone):
* emacs.c:
* emacs.c (main_1):
* emodules.c (Flist_modules):
* emodules.c (emodules_load):
* emodules.c (emodules_doc_sym):
* emodules.c (vars_of_module):
* event-Xt.c (x_has_keysym):
* event-gtk.c (emacs_gtk_format_magic_event):
* event-gtk.c (dragndrop_data_received):
* event-gtk.c (gtk_reset_key_mapping):
* event-msw.c (mswindows_dde_callback):
* event-msw.c (mswindows_wnd_proc):
* faces.c (complex_vars_of_faces):
* file-coding.c (find_coding_system):
* file-coding.c (setup_eol_coding_systems):
* file-coding.c (make_coding_system_1):
* file-coding.c (snarf_coding_system):
* fileio.c:
* fileio.c (lisp_strerror):
* fileio.c (Ffile_name_directory):
* fileio.c (Ffile_name_as_directory):
* fileio.c (Fdirectory_file_name):
* fileio.c (if):
* fileio.c (Ffile_symlink_p):
* fileio.c (Fencrypt_string):
* fileio.c (Fdecrypt_string):
* filelock.c (lock_file):
* filelock.c (Ffile_locked_p):
* floatfns.c (matherr):
* font-mgr.c (build_fcapi_string):
* font-mgr.c (make_xlfd_font_regexp):
* frame-msw.c (mswindows_window_id):
* frame-msw.c (mswindows_frame_property):
* frame-x.c:
* frame-x.c (color_to_string):
* frame-x.c (maybe_set_frame_title_format):
* frame-x.c (x_cde_transfer_callback):
* frame-x.c (Fx_window_id):
* glade.c (connector):
* glade.c (Fglade_xml_textdomain):
* glade.c (syms_of_glade):
* glyphs-eimage.c (jpeg_instantiate):
* glyphs-eimage.c (png_instantiate):
* glyphs-eimage.c (tiff_instantiate):
* glyphs-gtk.c (font_instantiate):
* glyphs-gtk.c (BUILD_GLYPH_INST):
* glyphs-x.c (x_locate_pixmap_file):
* glyphs-x.c (font_instantiate):
* glyphs-x.c (x_widget_property):
* glyphs-x.c (BUILD_GLYPH_INST):
* glyphs.c (print_image_instance):
* glyphs.c (bitmap_to_lisp_data):
* glyphs.c (pixmap_to_lisp_data):
* gpmevent.c (turn_off_gpm):
* gpmevent.c (Fgpm_enabled_p):
* gpmevent.c (Fgpm_enable):
* gtk-glue.c (__make_string_mapper):
* gtk-glue.c (xemacs_gtklist_to_list):
* gtk-xemacs.c (FROB_FACE):
* gtk-xemacs.c (xemacs_gtk_convert_color):
* hpplay.c (player_error_internal):
* hpplay.c (myHandler):
* insdel.c (buffer_insert_ascstring_1):
* insdel.h:
* insdel.h (buffer_insert_ascstring):
* intl.c (Fcurrent_locale):
* intl.c (Fset_current_locale):
* keymap.c (make_key_description):
* keymap.c (Ftext_char_description):
* keymap.c (describe_command):
* keymap.c (describe_map):
* lisp.h:
* lread.c:
* lread.c (locate_file_in_directory_mapper):
* lread.c (locate_file_construct_suffixed_files_mapper):
* mule-charset.c (Fmake_charset):
* nt.c (Fmswindows_short_file_name):
* nt.c (Fmswindows_long_file_name):
* objects-gtk.c (__get_gtk_font_truename):
* objects-gtk.c (__gtk_font_list_internal):
* objects-msw.c (font_enum_callback_2):
* objects-msw.c (create_hfont_from_font_spec):
* objects-msw.c (mswindows_font_list):
* objects-msw.c (mswindows_font_spec_matches_charset_stage_2):
* objects-tty.c (tty_initialize_font_instance):
* objects-x.c (x_font_truename):
* objects-x.c (x_font_instance_truename):
* objects-x.c (x_font_instance_properties):
* objects-x.c (x_font_list):
* print.c (write_cistring):
* print.c (print_vector_internal):
* print.c (print_cons):
* process-nt.c (nt_canonicalize_host_name):
* process-unix.c (unix_create_process):
* process-unix.c (unix_canonicalize_host_name):
* process.c (status_message):
* process.c (status_notify):
* process.c (init_xemacs_process):
* process.c (syms_of_process):
* redisplay-tty.c (term_get_fkeys_1):
* redisplay-tty.c (CONDITIONAL_REASSIGN):
* search.c (compile_pattern_1):
* select-common.h (selection_data_to_lisp_data):
* select-gtk.c (atom_to_symbol):
* select-gtk.c (PROCESSING_GTK_CODE):
* select-msw.c (mswindows_get_foreign_selection):
* select-x.c (x_atom_to_symbol):
* select-x.c (Fx_get_cutbuffer_internal):
* symbols.c (intern_istring):
* symbols.c (intern):
* symbols.c (intern_converting_underscores_to_dashes):
* symbols.c (Fintern):
* sysdep.c (init_system_name):
* sysdll.c (dll_error):
* sysdll.c (dll_open):
* syswindows.h:
* syswindows.h (build_tstr_string):
* tests.c (DFC_CHECK_LENGTH):
* tests.c (DFC_CHECK_CONTENT):
* tests.c (DFC_RESULT_PASS):
* tests.c (Ftest_data_format_conversion):
* text.c:
* text.c (new_dfc_convert_now_damn_it):
* text.h:
* text.h (build_wext_string):
* tooltalk.c (tt_build_c_string):
* tooltalk.c (Ftooltalk_default_procid):
* tooltalk.c (Ftooltalk_default_session):
* tooltalk.c (init_tooltalk):
* ui-byhand.c (Fgtk_clist_get_text):
* ui-byhand.c (Fgtk_clist_get_pixtext):
* ui-byhand.c (Fgtk_label_get):
* ui-byhand.c (Fgtk_notebook_query_tab_label_packing):
* ui-gtk.c (emacs_gtk_object_printer):
* ui-gtk.c (emacs_gtk_boxed_printer):
* ui-gtk.c (gtk_type_to_lisp):
* ui-gtk.c (symbol_to_enum):
* ui-gtk.c (enum_to_symbol):
* unexaix.c (report_error):
* unexaix.c (ERROR0):
* unexec.c (report_error):
* unexec.c (ERROR0):
* unicode.c (unicode_to_ichar):
* win32.c (tstr_to_local_file_format):
* win32.c (Fmswindows_cygwin_to_win32_path):
* win32.c (struct read_link_hash):
* xemacs.def.in.in:
Rename:
write_c_string -> write_cistring
build_intstring -> build_istring
build_string -> build_cistring
build_ext_string -> build_extstring
make_ext_string -> make_extstring
buffer_insert_c_string -> buffer_insert_ascstring
intern_int -> intern_istring
These functions have been renamed so that the naming harmonizes
with the typedefs for strings: `cistring' along with CIbyte *,
`istring' along with Ibyte *, `extstring' along with Extbyte *,
`ascstring' along with Ascbyte *.
Also make buffer_insert_ascstring take Ascbyte * and assert
that its argument is ASCII.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Wed, 27 Jan 2010 00:35:36 -0600 |
| parents | 8fea628c26fb |
| children | 8c406331e77e 861f2601a38b |
| rev | line source |
|---|---|
| 428 | 1 /* Synched up with: Completely divergent from FSF. */ |
| 2 #define SOLARIS2 1 | |
| 3 #define POSIX 1 | |
| 4 | |
| 5 #ifndef USG | |
| 6 #define USG | |
| 7 #endif | |
| 8 | |
| 9 #ifndef USG5_4 | |
| 10 #define USG5_4 | |
| 11 #endif | |
| 12 | |
| 13 /* Fix understandable GCC lossage on Solaris 2.6 */ | |
| 4122 | 14 #if defined(__GNUC__) && OS_RELEASE >= 506 && OS_RELEASE < 510 && !defined(NOT_C_CODE) |
| 428 | 15 |
| 16 /* GCC va_list munging is a little messed up */ | |
| 17 #define __GNUC_VA_LIST | |
| 18 #define _VA_LIST_ | |
| 19 #define _VA_LIST va_list | |
| 20 typedef void *__gnuc_va_list; | |
| 21 typedef __gnuc_va_list va_list; | |
| 22 | |
| 23 /* Missing prototypes for functions added in Solaris 2.6 */ | |
| 24 #include <sys/types.h> | |
| 25 struct msghdr; | |
| 26 struct sockaddr; | |
| 27 extern int __xnet_bind (int, const struct sockaddr *, size_t); | |
| 28 extern int __xnet_listen (int, int); | |
| 29 extern int __xnet_connect (int, const struct sockaddr *, size_t); | |
| 30 extern ssize_t __xnet_recvmsg (int, struct msghdr *, int); | |
| 31 extern ssize_t __xnet_sendmsg (int, const struct msghdr *, int); | |
| 32 extern ssize_t __xnet_sendto (int, const void *, size_t, int, const struct sockaddr *, size_t); | |
| 33 extern int __xnet_socket (int, int, int); | |
| 34 extern int __xnet_socketpair (int, int, int, int *); | |
| 35 extern int __xnet_getsockopt (int, int, int, void *, size_t *); | |
| 36 #endif /* GCC && >= Solaris 2.6 && C code */ | |
| 37 | |
| 38 #include "usg5-4-2.h" /* XEmacs change from 5-4 to 5-4-2 */ | |
| 39 #undef PC /* Defined in x86 /usr/include/sys/reg.h */ | |
| 40 | |
| 41 /* SIGIO seems to be working under Solaris and it makes ^G work better... */ | |
| 42 #undef BROKEN_SIGIO | |
| 43 | |
| 44 /* eggert@twinsun.com said these work in Solaris. | |
| 45 Perhaps they work in all kinds of SVR4, but this is more conservative. */ | |
| 46 #undef BROKEN_TIOCGETC | |
| 47 #undef BROKEN_TIOCGWINSZ | |
| 48 | |
| 49 #ifdef NOT_C_CODE | |
| 50 #define ORDINARY_LINK | |
| 51 /* XEmacs change -- some Motif packages need -lgen to get regex and regcmp */ | |
| 52 | |
| 53 #undef LIBS_SYSTEM | |
| 54 #define LIBS_SYSTEM "-lsocket -lnsl -lelf -lgen -ldl" | |
| 55 | |
| 56 /* SYSTEM_MALLOC must be defined if dbx/RTC is going to be used. dbx/RTC does | |
| 57 not work with a static definition of malloc(). */ | |
| 58 /* We want to be able to test out ralloc.c. */ | |
| 59 /* #define SYSTEM_MALLOC */ | |
| 60 | |
| 61 /* XEmacs: there used to be a special definition of | |
| 62 PTY_TTY_NAME_SPRINTF here that was identical to the | |
| 63 other SYSV R4 definitions except that it didn't | |
| 64 block SIGCHLD around the call to grantpt(). This | |
| 65 is *not* in 19.29 and is almost certainly incorrect. | |
| 66 */ | |
| 67 | |
| 68 #undef UNEXEC | |
| 1692 | 69 #if OS_RELEASE < 506 |
| 428 | 70 #define UNEXEC "unexsol2.o" |
| 71 #else | |
| 72 #define UNEXEC "unexsol2-6.o" | |
| 73 #endif | |
| 74 | |
| 75 #else /* C_CODE */ | |
| 76 | |
| 1692 | 77 #if OS_RELEASE <= 503 |
| 428 | 78 /* Solaris 2.3 has a bug in XListFontsWithInfo. */ |
| 79 #define BROKEN_XLISTFONTSWITHINFO | |
| 80 #endif | |
| 81 | |
| 82 /* XEmacs addition: Raymond Toy says XEmacs completely misses SIGCHLD | |
| 83 when compiled with GCC 2.7.0 (but not, apparently, with SunPro C?), | |
| 84 X11R6, and Solaris 2.4. | |
| 85 | |
| 86 Someone else submitted a simple test program that duplicates this | |
| 87 behavior, and says it has something to do with the fact that X11R6 | |
| 88 links with the threads library. */ | |
| 89 | |
| 90 #ifdef THIS_IS_X11R6 | |
| 91 #define BROKEN_SIGCHLD | |
| 92 #endif | |
| 93 | |
| 1692 | 94 #if OS_RELEASE < 505 |
| 428 | 95 |
| 96 #if __STDC__ == 1 && defined(__SUNPRO_C) | |
| 97 #define _POSIX_C_SOURCE 1 | |
| 98 #include <setjmp.h> | |
| 99 #undef _POSIX_C_SOURCE | |
| 100 #endif /* cc -Xc */ | |
| 101 | |
| 102 /* Missing prototype, added in Solaris 2.5 */ | |
| 103 extern void *__builtin_alloca (size_t); | |
| 104 #endif /* before SunOS 5.5 */ | |
| 105 | |
| 1692 | 106 #if OS_RELEASE == 505 |
| 428 | 107 /* The following functions were added in Solaris 2.5, |
| 108 but they forgot to add prototypes to the system header files. */ | |
| 109 int getpagesize (void); | |
| 110 long random (void); | |
| 111 void srandom (unsigned int seed); | |
| 112 int usleep (unsigned int useconds); | |
| 113 #endif /* SunOS 5.5 */ | |
| 114 | |
| 115 /* 2.5 now has `random' back in libc but we don't want to use it. */ | |
| 1692 | 116 #if OS_RELEASE >= 505 |
| 428 | 117 #undef HAVE_RANDOM |
| 118 /* Apparently not necessary here, and it causes 10% CPU chewage. */ | |
| 119 #undef BROKEN_SIGCHLD | |
| 120 #endif /* >= SunOS 5.5 */ | |
| 121 | |
| 1692 | 122 #if OS_RELEASE < 506 |
| 428 | 123 /* Missing prototypes, added in Solaris 2.6 */ |
| 124 struct timeval; | |
| 125 int utimes (char *file, struct timeval *tvp); | |
| 126 int gethostname (char *name, int namelen); | |
| 127 #endif /* before SunOS 5.6 */ | |
| 128 | |
| 129 #include <sys/utsname.h> /* warning: macro redefined: SYS_NMLN */ | |
| 130 | |
| 131 /* XEmacs: Solaris has sigsetjmp but using it leads to core dumps at | |
| 132 least under 2.4 */ | |
| 133 #undef _setjmp | |
| 134 #define _setjmp setjmp | |
| 135 | |
| 136 #endif /* C_CODE */ |