Author: weiden
Date: Tue Sep 5 00:14:48 2006
New Revision: 23916
URL: http://svn.reactos.org/svn/reactos?rev=23916&view=rev
Log:
rename version.h to ver.h to avoid a possible conflict with include/reactos/version.h
Added:
trunk/reactos/boot/freeldr/freeldr/include/ver.h
- copied unchanged from r23915, trunk/reactos/boot/freeldr/freeldr/include/version.h
Removed:
trunk/reactos/boot/freeldr/freeldr/include/version.h
Modified:
trunk/reactos/boot/freeldr/freeldr/arch/i386/i386trap.S
trunk/reactos/boot/freeldr/freeldr/include/freeldr.h
Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386trap.S
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386trap.S (original)
+++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386trap.S Tue Sep 5 00:14:48 2006
@@ -22,7 +22,7 @@
#define ASM
#include <arch.h>
-#include <version.h>
+#include <ver.h>
#define SCREEN_ATTR 0x1f /* Bright white on blue background */
Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h (original)
+++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h Tue Sep 5 00:14:48 2006
@@ -64,7 +64,7 @@
#endif
/* misc files */
#include <keycodes.h>
-#include <version.h>
+#include <ver.h>
#include <cmdline.h>
/* Needed by boot manager */
#include <bootmgr.h>
Removed: trunk/reactos/boot/freeldr/freeldr/include/version.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/include/version.h (original)
+++ trunk/reactos/boot/freeldr/freeldr/include/version.h (removed)
@@ -1,49 +1,0 @@
-/*
- * FreeLoader
- * Copyright (C) 1998-2005 Brian Palmer <brianp(a)sginet.com>
- *
- * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef __VERSION_H
-#define __VERSION_H
-
-
-/* just some stuff */
-#define VERSION "FreeLoader v2.1"
-#define COPYRIGHT "Copyright (C) 1998-2005 Brian Palmer <brianp(a)sginet.com>"
-#define AUTHOR_EMAIL "<brianp(a)sginet.com>"
-#define BY_AUTHOR "by Brian Palmer"
-
-// FreeLoader version defines
-//
-// NOTE:
-// If you fix bugs then you increment the patch version
-// If you add features then you increment the minor version and zero the patch version
-// If you add major functionality then you increment the major version and zero the minor & patch versions
-//
-#define FREELOADER_MAJOR_VERSION 2
-#define FREELOADER_MINOR_VERSION 1
-#define FREELOADER_PATCH_VERSION 0
-
-
-#ifndef ASM
-
-PCHAR GetFreeLoaderVersionString(VOID);
-
-#endif // ASM
-
-
-#endif // defined __VERSION_H