From 38886de0c3e9ea5729ef23e4c653fa2822f52e8f Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 6 Apr 2021 14:43:39 +0200
Subject: xscreensaver 6.00

---
 hacks/apple2-main.c | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

(limited to 'hacks/apple2-main.c')

diff --git a/hacks/apple2-main.c b/hacks/apple2-main.c
index c30be1f..a87ea1a 100644
--- a/hacks/apple2-main.c
+++ b/hacks/apple2-main.c
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 1998-2014 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 1998-2021 Jamie Zawinski <jwz@jwz.org>
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -13,9 +13,10 @@
  * Pty and vt100 emulation by Fredrik Tolf <fredrik@dolda2000.com>
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif /* HAVE_CONFIG_H */
+#include "screenhack.h"
+#include "apple2.h"
+#include "textclient.h"
+#include "utf8wc.h"
 
 #include <math.h>
 #include <ctype.h>
@@ -24,14 +25,6 @@
 # include <unistd.h>
 #endif
 
-#include "screenhack.h"
-#include "apple2.h"
-#include "textclient.h"
-#include "utf8wc.h"
-
-#undef countof
-#define countof(x) (sizeof((x))/sizeof((*x)))
-
 #define SCREEN_COLS 40
 #define SCREEN_ROWS 24
 
-- 
cgit v1.2.3-55-g7522