From: root <root>
Date: Wed, 16 Feb 2005 21:37:10 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=2ccb4c092ff4db1604cebe14f41a5e9502d38b25;p=dana%2Furxvt.git

*** empty log message ***
---

diff --git a/src/Makefile.in b/src/Makefile.in
index 0b80086c..91d62ed8 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -101,12 +101,6 @@ install: allbin alldoc
 	$(INSTALL_PROGRAM) rxvtc $(RXVTC_BINNAME)
 	$(INSTALL_PROGRAM) rxvtd $(RXVTD_BINNAME)
 
-distdirs:
-	mkdir $(basedir)/../$(VERNAME)/$(thisdir)
-
-distcopy: $(INTPROS)
-	$(CP) -p $(DIST) $(basedir)/../$(VERNAME)/$(thisdir)
-
 depend:
 	makedepend -f Makefile.in -I. -Y *.C >/dev/null 2>&1
 	makedepend -f Makefile.in -I. -Y *.C -a -o .lo >/dev/null 2>&1
diff --git a/src/logging.C b/src/logging.C
index 0844ee86..e8606954 100644
--- a/src/logging.C
+++ b/src/logging.C
@@ -44,8 +44,11 @@
 #include "logging.h"
 #ifdef UTMP_SUPPORT
 
+#if HAVE_STRUCT_UTMP
 int              rxvt_write_bsd_utmp              (int utmp_pos, struct utmp *wu);
 void             rxvt_update_wtmp                 (const char *fname, const struct utmp *putmp);
+#endif
+
 void             rxvt_update_lastlog              (const char *fname, const char *pty, const char *host);
 
 /*
@@ -214,6 +217,8 @@ rxvt_term::makeutent (const char *pty, const char *hostname)
 # ifdef HAVE_STRUCT_UTMPX
 #  if HAVE_UPDWTMPX
       updwtmpx (RXVT_WTMPX_FILE, utx);
+#  else
+      pututxline (utx);
 #  endif
 # endif
     }
@@ -293,6 +298,8 @@ rxvt_term::cleanutent ()
 # ifdef HAVE_STRUCT_UTMPX
 #  if HAVE_UPDWTMPX
       updwtmpx (RXVT_WTMPX_FILE, utx);
+#  else
+      pututxline (utx);
 #  endif
 # endif
     }
@@ -323,7 +330,6 @@ rxvt_term::cleanutent ()
  * Write a BSD style utmp entry
  */
 #ifdef HAVE_UTMP_H
-/* INTPROTO */
 int
 rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu)
 {
@@ -343,8 +349,7 @@ rxvt_write_bsd_utmp (int utmp_pos, struct utmp *wu)
 /*
  * Update a BSD style wtmp entry
  */
-#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP)
-/* INTPROTO */
+#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) && defined(HAVE_STRUCT_UTMP)
 void
 rxvt_update_wtmp (const char *fname, const struct utmp *putmp)
 {
@@ -386,7 +391,6 @@ rxvt_update_wtmp (const char *fname, const struct utmp *putmp)
 
 /* ------------------------------------------------------------------------- */
 #ifdef LASTLOG_SUPPORT
-/* INTPROTO */
 void
 rxvt_update_lastlog (const char *fname, const char *pty, const char *host)
 {
diff --git a/src/main.C b/src/main.C
index f274c806..1e54a03e 100644
--- a/src/main.C
+++ b/src/main.C
@@ -591,7 +591,6 @@ rxvt_malloc (size_t size)
   return p;
 }
 
-/* INTPROTO */
 void           *
 rxvt_calloc (size_t number, size_t size)
 {
@@ -603,7 +602,6 @@ rxvt_calloc (size_t number, size_t size)
   return p;
 }
 
-/* INTPROTO */
 void           *
 rxvt_realloc (void *ptr, size_t size)
 {
diff --git a/src/misc.C b/src/misc.C
index ef55cee7..c391bbd2 100644
--- a/src/misc.C
+++ b/src/misc.C
@@ -169,7 +169,6 @@ rxvt_strdup (const char *str)
   return str ? strdup (str) : 0;
 }
 
-/* INTPROTO */
 char *
 rxvt_r_basename (const char *str)
 {
@@ -181,7 +180,6 @@ rxvt_r_basename (const char *str)
 /*
  * Print an error message
  */
-/* INTPROTO */
 void
 rxvt_vlog (const char *fmt, va_list arg_ptr)
 {
@@ -195,7 +193,6 @@ rxvt_vlog (const char *fmt, va_list arg_ptr)
     write (STDOUT_FILENO, msg, strlen (msg));
 }
 
-/* INTPROTO */
 void
 rxvt_log (const char *fmt,...)
 {
@@ -209,7 +206,6 @@ rxvt_log (const char *fmt,...)
 /*
  * Print an error message
  */
-/* INTPROTO */
 void
 rxvt_warn (const char *fmt,...)
 {
@@ -222,7 +218,6 @@ rxvt_warn (const char *fmt,...)
   va_end (arg_ptr);
 }
 
-/* INTPROTO */
 void
 rxvt_fatal (const char *fmt,...)
 {
@@ -239,7 +234,6 @@ rxvt_fatal (const char *fmt,...)
 
 class rxvt_failure_exception rxvt_failure_exception;
 
-/* INTPROTO */
 void
 rxvt_exit_failure ()
 {
@@ -254,7 +248,6 @@ rxvt_exit_failure ()
  * Match
  *      return: strlen (S2)
  */
-/* INTPROTO */
 int
 rxvt_Str_match (const char *s1, const char *s2)
 {
@@ -263,7 +256,6 @@ rxvt_Str_match (const char *s1, const char *s2)
   return ((strncmp (s1, s2, n) == 0) ? n : 0);
 }
 
-/* INTPROTO */
 const char *
 rxvt_Str_skip_space (const char *str)
 {
@@ -278,7 +270,6 @@ rxvt_Str_skip_space (const char *str)
  * remove leading/trailing space and strip-off leading/trailing quotes.
  * in place.
  */
-/* INTPROTO */
 char           *
 rxvt_Str_trim (char *str)
 {
@@ -326,7 +317,6 @@ rxvt_Str_trim (char *str)
  *
  * returns the converted string length
  */
-/* INTPROTO */
 int
 rxvt_Str_escaped (char *str)
 {
@@ -403,7 +393,6 @@ rxvt_Str_escaped (char *str)
  * trailing spaces from each entry.  Empty strings are properly returned
  * Caller should free each entry and array when done
  */
-/* INTPROTO */
 char          **
 rxvt_splitcommastring (const char *cs)
 {
@@ -457,7 +446,6 @@ rxvt_freecommastring (char **cs)
  *
  * FILE is either semi-colon or zero terminated
  */
-/* INTPROTO */
 char           *
 rxvt_File_search_path (const char *pathlist, const char *file, const char *ext)
 {
@@ -530,7 +518,6 @@ rxvt_File_search_path (const char *pathlist, const char *file, const char *ext)
   return NULL;
 }
 
-/* INTPROTO */
 char           *
 rxvt_File_find (const char *file, const char *ext, const char *path)
 {
@@ -563,7 +550,6 @@ rxvt_File_find (const char *file, const char *ext, const char *path)
  * Draw top/left and bottom/right border shadows around windows
  */
 #if defined(RXVT_SCROLLBAR) || defined(MENUBAR)
-/* INTPROTO */
 void
 rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h)
 {
@@ -584,7 +570,6 @@ rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int
 
 /* button shapes */
 #ifdef MENUBAR
-/* INTPROTO */
 void
 rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type)
 {
diff --git a/src/xpm.C b/src/xpm.C
index a8fa6e15..01f4f4d7 100644
--- a/src/xpm.C
+++ b/src/xpm.C
@@ -269,7 +269,6 @@ rxvt_term::resize_pixmap ()
  * Calculate tiling sizes and increments
  * At start, p == 0, incr == xpmwidthheight
  */
-/* INTPROTO */
 static void
 rxvt_pixmap_incr (unsigned int *wh, unsigned int *xy, float *incr, float *p, unsigned int widthheight, unsigned int xpmwidthheight)
 {