X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fglob.h;h=c6cdeb1d9ea95b1ee710fa83ed4bac828d5d6bb6;hb=e862eacf7e076495bb1859c5e10dc426761dbde0;hp=67391c85388b6ab306b471fb357c875459faf8bb;hpb=2bb81ea2565c3627c954b5c37326db89b0048472;p=flatwaifu.git

diff --git a/src/glob.h b/src/glob.h
index 67391c8..c6cdeb1 100644
--- a/src/glob.h
+++ b/src/glob.h
@@ -1,24 +1,19 @@
-/*
-   Copyright (C) Prikol Software 1996-1997
-   Copyright (C) Aleksey Volynskov 1996-1997
-   Copyright (C) <ARembo@gmail.com> 2011
-
-   This file is part of the Doom2D:Rembo project.
-
-   Doom2D:Rembo is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 as
-   published by the Free Software Foundation.
-
-   Doom2D:Rembo 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, see <http://www.gnu.org/licenses/> or
-   write to the Free Software Foundation, Inc.,
-   51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-*/
+/* Copyright (C) 1996-1997 Aleksey Volynskov
+ * Copyright (C) 2011 Rambo
+ * Copyright (C) 2020 SovietPony
+ *
+ * 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, version 3 of the License ONLY.
+ *
+ * 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, see <http://www.gnu.org/licenses/>.
+ */
 
 // Globals
 
@@ -46,8 +41,12 @@ typedef unsigned int dword;
 #define __MAX_FNAME 50
 #define __MAX_EXT 50
 
-#define min(a,b) ((a)<(b)?(a):(b))
-#define max(a,b) ((a)>(b)?(a):(b))
+#ifndef min
+#  define min(a,b) ((a)<(b)?(a):(b))
+#endif
+#ifndef max
+#  define max(a,b) ((a)>(b)?(a):(b))
+#endif
 
 #define myrand(a) (rand()%(a))