From 82d8bada8b53bc9d955a02da3078dc5eacb91940 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Sat, 21 Mar 2009 09:35:13 +1000
Subject: Remove some file include idiocy.

version.c has nothing interesting, but it depends on libvers.c's #defines.
WTF wasn't that just in the same file in the first place??
---
 src/tet3/apilib/libvers.c | 39 +++++++++++++++++++++++++++-
 src/tet3/apilib/version.c | 65 -----------------------------------------------
 2 files changed, 38 insertions(+), 66 deletions(-)
 delete mode 100644 src/tet3/apilib/version.c

(limited to 'src/tet3')

diff --git a/src/tet3/apilib/libvers.c b/src/tet3/apilib/libvers.c
index d1df5b28..366dec0d 100644
--- a/src/tet3/apilib/libvers.c
+++ b/src/tet3/apilib/libvers.c
@@ -69,6 +69,43 @@ MODIFICATIONS:
 ** apilib/version.c contains a definition of TET_VERSION_STRINGS in terms
 ** of the #defines supplied in this file
 */
-#include "version.c"
+
+#ifndef lint
+static char sccsid1[] = "@(#)version.c	1.1 (98/09/01) TET3 release 3.3";
+#endif
+
+/************************************************************************
+
+SCCS:   	@(#)version.c	1.1 98/09/01 TETware release 3.3
+NAME:		version.c
+PRODUCT:	TETware
+AUTHOR:		Andrew Dingwall, UniSoft Ltd.
+DATE CREATED:	July 1998
+
+DESCRIPTION:
+	library version strings
+
+	this file in #include'd in apilib/libvers.c and tcm/ckversion.c
+
+	the file that includes this one should define TET_VERSION,
+	TET_VERSION_STRINGS and TET_VERSION_STORAGE_CLASS
+
+MODIFICATIONS:
+
+************************************************************************/
+
+/* the version strings themselves */
+TET_VERSION_STORAGE_CLASS char *TET_VERSION_STRINGS[] = {
+
+
+#ifdef TET_THREADS
+	"Thread-safe",
+#else
+	"Single-threaded",
+#endif
+
+	TET_VERSION,
+	(char *) 0
+};
 
 
diff --git a/src/tet3/apilib/version.c b/src/tet3/apilib/version.c
deleted file mode 100644
index fbe13222..00000000
--- a/src/tet3/apilib/version.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- *	SCCS: @(#)version.c	1.1 (98/09/01)
- *
- *	UniSoft Ltd., London, England
- *
- * Copyright (c) 1998 The Open Group
- * All rights reserved.
- *
- * No part of this source code may be reproduced, stored in a retrieval
- * system, or transmitted, in any form or by any means, electronic,
- * mechanical, photocopying, recording or otherwise, except as stated
- * in the end-user licence agreement, without the prior permission of
- * the copyright owners.
- * A copy of the end-user licence agreement is contained in the file
- * Licence which accompanies this distribution.
- * 
- * Motif, OSF/1, UNIX and the "X" device are registered trademarks and
- * IT DialTone and The Open Group are trademarks of The Open Group in
- * the US and other countries.
- *
- * X/Open is a trademark of X/Open Company Limited in the UK and other
- * countries.
- *
- */
-
-#ifndef lint
-static char sccsid1[] = "@(#)version.c	1.1 (98/09/01) TET3 release 3.3";
-#endif
-
-/************************************************************************
-
-SCCS:   	@(#)version.c	1.1 98/09/01 TETware release 3.3
-NAME:		version.c
-PRODUCT:	TETware
-AUTHOR:		Andrew Dingwall, UniSoft Ltd.
-DATE CREATED:	July 1998
-
-DESCRIPTION:
-	library version strings
-
-	this file in #include'd in apilib/libvers.c and tcm/ckversion.c
-
-	the file that includes this one should define TET_VERSION,
-	TET_VERSION_STRINGS and TET_VERSION_STORAGE_CLASS
-
-MODIFICATIONS:
-
-************************************************************************/
-
-
-/* the version strings themselves */
-TET_VERSION_STORAGE_CLASS char *TET_VERSION_STRINGS[] = {
-
-
-#ifdef TET_THREADS
-	"Thread-safe",
-#else
-	"Single-threaded",
-#endif
-
-	TET_VERSION,
-	(char *) 0
-};
-
-
-- 
cgit v1.2.3