[Emacs-diffs] Changes to emacs/src/termcap.c,v

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   08/07/27 18:24:49

Index: src/termcap.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/termcap.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- src/termcap.c       8 Jan 2008 20:44:21 -0000       1.32
+++ src/termcap.c       27 Jul 2008 18:24:47 -0000      1.33
@@ -144,9 +144,6 @@
   return NULL;
 }
 
-/* These are already defined in the System framework in Mac OS X and
-   cause prebinding to fail.  */
-#ifndef MAC_OSX
 int
 tgetnum (cap)
      char *cap;
@@ -180,7 +177,6 @@
     return NULL;
   return tgetst1 (ptr, area);
 }
-#endif /* MAC_OSX */
 
 #ifdef IS_EBCDIC_HOST
 /* Table, indexed by a character in range 0200 to 0300 with 0200 subtracted,
@@ -345,11 +341,7 @@
 int tputs_baud_rate;
 #endif
 
-/* Already defined in the System framework in Mac OS X and causes
-   prebinding to fail.  */
-#ifndef MAC_OSX
 char PC;
-#endif  /* MAC_OSX */
 
 #ifndef emacs
 /* Actual baud rate if positive;
@@ -368,9 +360,6 @@
 
 #endif /* not emacs */
 
-/* Already defined in the System framework in Mac OS X and causes
-   prebinding to fail.  */
-#ifndef MAC_OSX
 void
 tputs (str, nlines, outfun)
      register char *str;
@@ -433,7 +422,6 @@
   while (padcount-- > 0)
     (*outfun) (PC);
 }
-#endif /* MAC_OSX */
 
 /* Finding the termcap entry in the termcap data base.  */
 
@@ -505,9 +493,6 @@
    0 if the data base is accessible but the type NAME is not defined
    in it, and some other value otherwise.  */
 
-/* Already defined in the System framework in Mac OS X and causes
-   prebinding to fail.  */
-#ifndef MAC_OSX
 int
 tgetent (bp, name)
      char *bp, *name;
@@ -666,7 +651,6 @@
   term_entry = bp;
   return 1;
 }
-#endif /* MAC_OSX */
 
 /* Given file open on FD and buffer BUFP,
    scan the file from the beginning until a line is found