X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib.h;h=a6eb67b4e40354187eb31552df1ff68957323f2c;hp=b496e04c3a2d45483e44dbcb5881a2cc02257d30;hb=f422bddfe7468c3f36388a8830c832c01841eabc;hpb=c30879afd71ee24e706b6d8c7b7916f36407e937

diff --git a/lib.h b/lib.h
index b496e04..a6eb67b 100644
--- a/lib.h
+++ b/lib.h
@@ -1,24 +1,12 @@
 /*
+ * Copyright notice from original mutt:
  * Copyright (C) 1996-2000 Michael R. Elkins <me@mutt.org>
  * Copyright (C) 1999-2000 Thomas Roessler <roessler@does-not-exist.org>
- * 
- *     This program is free software; you can redistribute it
- *     and/or modify it under the terms of the GNU General Public
- *     License as published by the Free Software Foundation; either
- *     version 2 of the License, or (at your option) any later
- *     version.
- * 
- *     This program is distributed in the hope that it will be
- *     useful, but WITHOUT ANY WARRANTY; without even the implied
- *     warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *     PURPOSE.  See the GNU General Public License for more
- *     details.
- * 
- *     You should have received a copy of the GNU General Public
- *     License along with this program; if not, write to the Free
- *     Software Foundation, Inc., 59 Temple Place - Suite 330,
- *     Boston, MA  02111, USA.
- */ 
+ *
+ * This file is part of mutt-ng, see http://www.muttng.org/.
+ * It's licensed under the GNU General Public License,
+ * please see the file GPL in the top level source directory.
+ */
 
 /* mutt functions which are generally useful. */
 
@@ -28,7 +16,7 @@
 # include <stdio.h>
 # include <string.h>
 # ifdef HAVE_UNISTD_H
-#  include <unistd.h> /* needed for SEEK_SET */
+#  include <unistd.h>           /* needed for SEEK_SET */
 # endif
 # include <sys/types.h>
 # include <sys/stat.h>
@@ -41,19 +29,6 @@
 #  include <posix1_lim.h>
 # endif
 
-# ifdef ENABLE_NLS
-#  include <libintl.h>
-# define _(a) (gettext (a))
-#  ifdef gettext_noop
-#   define N_(a) gettext_noop (a)
-#  else
-#   define N_(a) (a)
-#  endif
-# else
-#  define _(a) (a)
-#  define N_(a) a
-# endif
-
 # define TRUE 1
 # define FALSE 0
 
@@ -73,9 +48,6 @@
 # define MUTT_FORMAT(a)		_MUTT_FORMAT_1(a, "s")
 # define MUTT_FORMAT2(a,b)	_MUTT_FORMAT_1(a, b)
 
-
-# define FREE(x) safe_free(x)
-# define NONULL(x) x?x:""
 # define ISSPACE(c) isspace((unsigned char)c)
 # define strfcpy(A,B,C) strncpy(A,B,C), *(A+(C)-1)=0
 
@@ -84,7 +56,6 @@
 # define MAX(a,b) ((a) < (b) ? (b) : (a))
 # define MIN(a,b) ((a) < (b) ? (a) : (b))
 
-
 #define FOREVER while (1)
 
 /* this macro must check for *c == 0 since isspace(0) has unreliable behavior
@@ -137,15 +108,11 @@ int safe_fclose (FILE **);
 size_t mutt_quote_filename (char *, size_t, const char *);
 size_t mutt_strlen (const char *);
 
-void *safe_calloc (size_t, size_t);
-void *safe_malloc (size_t);
 void mutt_nocurses_error (const char *, ...);
 void mutt_remove_trailing_ws (char *);
 void mutt_sanitize_filename (char *, short);
 void mutt_str_replace (char **p, const char *s);
 void mutt_str_adjust (char **p);
 void mutt_unlink (const char *);
-void safe_free (void *);
-void safe_realloc (void *, size_t);
 
 #endif