Nico Golde:

[apps/madmutt.git] / globals.h

diff --git a/globals.h b/globals.h
index 35ec648..b7ba1b8 100644 (file)
--- a/globals.h
+++ b/globals.h
@@ -1,20 +1,15 @@
 /*
+ * Copyright notice from original mutt:
  * Copyright (C) 1996-2002 Michael R. Elkins <me@mutt.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.
  */
+#ifndef _GLOBALS_H
+#define _GLOBALS_H
+
+#include "lib/str.h"
 
 WHERE void (*mutt_error) (const char *, ...);
 WHERE void (*mutt_message) (const char *, ...);
@@ -220,7 +215,6 @@ WHERE short ScoreThresholdDelete;
 WHERE short ScoreThresholdRead;
 WHERE short ScoreThresholdFlag;
 
-WHERE struct buffy_t *CurBuffy INITVAL (0);
 WHERE short DrawFullLine INITVAL (0);
 WHERE short SidebarWidth;
 
@@ -310,3 +304,5 @@ extern const char *Months[];
 #include "sort.h"
 #include "mutt_crypt.h"
 #endif /* MAIN_C */
+
+#endif /* !_GLOBALS_H */