Mercurial > emacs
changeset 85826:345d3b46b5d3
* s/usg5-4.h:
* s/usg5-3.h:
* s/ptx.h:
* m/is386.h:
* m/ibmps2-aix.h:
* Makefile.in: Remove all mentions of X10
* dispnew.c (syms_of_display): Don't mention version 10.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Wed, 31 Oct 2007 06:55:00 +0000 |
| parents | 13163bbed0bf |
| children | 986bd9a20efa |
| files | src/ChangeLog src/Makefile.in src/dispnew.c src/m/ibmps2-aix.h src/m/is386.h src/s/ptx.h src/s/usg5-3.h src/s/usg5-4.h |
| diffstat | 8 files changed, 13 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Wed Oct 31 06:28:09 2007 +0000 +++ b/src/ChangeLog Wed Oct 31 06:55:00 2007 +0000 @@ -1,3 +1,14 @@ +2007-10-31 Dan Nicolaescu <dann@ics.uci.edu> + + * s/usg5-4.h: + * s/usg5-3.h: + * s/ptx.h: + * m/is386.h: + * m/ibmps2-aix.h: + * Makefile.in: Remove all mentions of X10 + + * dispnew.c (syms_of_display): Don't mention version 10. + 2007-10-28 Juanma Barranquero <lekktu@gmail.com> * makefile.w32-in (OBJ1): Remove abbrev.$(O).
--- a/src/Makefile.in Wed Oct 31 06:28:09 2007 +0000 +++ b/src/Makefile.in Wed Oct 31 06:55:00 2007 +0000 @@ -279,18 +279,10 @@ .c.o: $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $< -#ifndef LIBX10_MACHINE -#define LIBX10_MACHINE -#endif - #ifndef LIBX11_MACHINE #define LIBX11_MACHINE #endif -#ifndef LIBX10_SYSTEM -#define LIBX10_SYSTEM -#endif - #ifndef LIBX11_SYSTEM #define LIBX11_SYSTEM #endif @@ -446,7 +438,7 @@ X11_LDFLAGS = LD_SWITCH_X_SITE LD_SWITCH_X_DEFAULT LIBX= $(LIBXMENU) $(X11_LDFLAGS) $(LIBXT) LIBTIFF LIBJPEG LIBPNG LIBGIF LIBXPM LIB_X11_LIB LIBX11_MACHINE LIBX11_SYSTEM $(XFT_LIBS) #else /* not HAVE_X11 */ -LIBX= $(LIBXMENU) LD_SWITCH_X_SITE -lX10 LIBX10_MACHINE LIBX10_SYSTEM +LIBX= $(LIBXMENU) LD_SWITCH_X_SITE #endif /* not HAVE_X11 */ #else /* not HAVE_X_WINDOWS */ #endif /* not HAVE_X_WINDOWS */
--- a/src/dispnew.c Wed Oct 31 06:28:09 2007 +0000 +++ b/src/dispnew.c Wed Oct 31 06:55:00 2007 +0000 @@ -7112,7 +7112,7 @@ DEFVAR_LISP ("window-system-version", &Vwindow_system_version, doc: /* The version number of the window system in use. -For X windows, this is 10 or 11. */); +For X windows, this is 11. */); DEFVAR_BOOL ("cursor-in-echo-area", &cursor_in_echo_area, doc: /* Non-nil means put cursor in minibuffer, at end of any message there. */);
--- a/src/m/ibmps2-aix.h Wed Oct 31 06:28:09 2007 +0000 +++ b/src/m/ibmps2-aix.h Wed Oct 31 06:55:00 2007 +0000 @@ -213,7 +213,6 @@ #undef NOMULTIPLEJOBS #undef BROKEN_TIOCGETC #undef BROKEN_TIOCGWINSZ -#undef LIBX10_SYSTEM #undef LIBX11_SYSTEM #undef LIB_X11_LIB #endif
--- a/src/m/is386.h Wed Oct 31 06:28:09 2007 +0000 +++ b/src/m/is386.h Wed Oct 31 06:55:00 2007 +0000 @@ -21,7 +21,6 @@ It may also be correct for Microport systems. NOTE-END */ -#define LIBX10_MACHINE -lnsl_s #define LIBX11_MACHINE -lnsl_s #define LIBS_DEBUG -lg
--- a/src/s/ptx.h Wed Oct 31 06:28:09 2007 +0000 +++ b/src/s/ptx.h Wed Oct 31 06:55:00 2007 +0000 @@ -29,7 +29,6 @@ /* Undo these defines because they are incorrect or need to be changed. */ #undef LIB_X11_LIB -#undef LIBX10_SYSTEM #undef LIBX11_SYSTEM #undef USG_SHARED_LIBRARIES
--- a/src/s/usg5-3.h Wed Oct 31 06:28:09 2007 +0000 +++ b/src/s/usg5-3.h Wed Oct 31 06:55:00 2007 +0000 @@ -181,7 +181,6 @@ /* X needs to talk on the network, so search the network library. */ -#define LIBX10_SYSTEM -lnsl_s #define LIBX11_SYSTEM -lpt -lnls -lnsl_s -lc_s /* The docs for system V/386 suggest v.3 has sigpause,
--- a/src/s/usg5-4.h Wed Oct 31 06:28:09 2007 +0000 +++ b/src/s/usg5-4.h Wed Oct 31 06:55:00 2007 +0000 @@ -180,7 +180,6 @@ library, as opposed to a DLL. Share libraries were used in SVR3, and are available only in order to allow SVR3 binaries to run. They should not be linked in to new binaries. -- caraway!pinkas@caraway.intel.com. */ -#undef LIBX10_SYSTEM #undef LIBX11_SYSTEM /* Tell x11term.c and keyboard.c we have the system V streams feature. */