diff --git a/src/ca65/objcode.c b/src/ca65/objcode.c
index 13dfd7069..f0842d5f3 100644
--- a/src/ca65/objcode.c
+++ b/src/ca65/objcode.c
@@ -40,6 +40,7 @@
#include "chartype.h"
#include "check.h"
#include "segdefs.h"
+#include "segnames.h"
#include "xmalloc.h"
/* cc65 */
diff --git a/src/cc65/segments.c b/src/cc65/segments.c
index c2f080fab..dd7817b88 100644
--- a/src/cc65/segments.c
+++ b/src/cc65/segments.c
@@ -41,6 +41,7 @@
#include "check.h"
#include "coll.h"
#include "scanner.h"
+#include "segnames.h"
#include "xmalloc.h"
/* cc65 */
@@ -85,10 +86,10 @@ static Collection SegmentStack = STATIC_COLLECTION_INITIALIZER;
void InitSegNames (void)
/* Initialize the segment names */
{
- SegmentNames [SEG_BSS] = xstrdup ("BSS");
- SegmentNames [SEG_CODE] = xstrdup ("CODE");
- SegmentNames [SEG_DATA] = xstrdup ("DATA");
- SegmentNames [SEG_RODATA] = xstrdup ("RODATA");
+ SegmentNames [SEG_BSS] = xstrdup (SEGNAME_BSS);
+ SegmentNames [SEG_CODE] = xstrdup (SEGNAME_CODE);
+ SegmentNames [SEG_DATA] = xstrdup (SEGNAME_DATA);
+ SegmentNames [SEG_RODATA] = xstrdup (SEGNAME_RODATA);
}
diff --git a/src/common/segdefs.h b/src/common/segdefs.h
index a0d925dd2..836ff9281 100644
--- a/src/common/segdefs.h
+++ b/src/common/segdefs.h
@@ -7,9 +7,9 @@
/* */
/* */
/* (C) 1998-2002 Ullrich von Bassewitz */
-/* Wacholderweg 14 */
-/* D-70597 Stuttgart */
-/* EMail: uz@musoftware.de */
+/* R�merstrasse 52 */
+/* D-70794 Filderstadt */
+/* EMail: uz@cc65.org */
/* */
/* */
/* This software is provided 'as-is', without any expressed or implied */
@@ -50,14 +50,6 @@
#define SEGTYPE_ZP 2
#define SEGTYPE_FAR 3
-/* Default segment names */
-#define SEGNAME_NULL "NULL"
-#define SEGNAME_ZEROPAGE "ZEROPAGE"
-#define SEGNAME_DATA "DATA"
-#define SEGNAME_BSS "BSS"
-#define SEGNAME_RODATA "RODATA"
-#define SEGNAME_CODE "CODE"
-
/* Fragment types in the object file */
#define FRAG_TYPEMASK 0x38 /* Mask the type of the fragment */
#define FRAG_BYTEMASK 0x07 /* Mask for byte count */
diff --git a/src/common/segnames.h b/src/common/segnames.h
new file mode 100644
index 000000000..4b20839b7
--- /dev/null
+++ b/src/common/segnames.h
@@ -0,0 +1,68 @@
+/*****************************************************************************/
+/* */
+/* segnames.h */
+/* */
+/* Default segment names */
+/* */
+/* */
+/* */
+/* (C) 2003 Ullrich von Bassewitz */
+/* R�merstrasse 52 */
+/* D-70794 Filderstadt */
+/* EMail: uz@cc65.org */
+/* */
+/* */
+/* This software is provided 'as-is', without any expressed or implied */
+/* warranty. In no event will the authors be held liable for any damages */
+/* arising from the use of this software. */
+/* */
+/* Permission is granted to anyone to use this software for any purpose, */
+/* including commercial applications, and to alter it and redistribute it */
+/* freely, subject to the following restrictions: */
+/* */
+/* 1. The origin of this software must not be misrepresented; you must not */
+/* claim that you wrote the original software. If you use this software */
+/* in a product, an acknowledgment in the product documentation would be */
+/* appreciated but is not required. */
+/* 2. Altered source versions must be plainly marked as such, and must not */
+/* be misrepresented as being the original software. */
+/* 3. This notice may not be removed or altered from any source */
+/* distribution. */
+/* */
+/*****************************************************************************/
+
+
+
+#ifndef SEGNAMES_H
+#define SEGNAMES_H
+
+
+
+/*****************************************************************************/
+/* Data */
+/*****************************************************************************/
+
+
+
+/* Default segment names */
+#define SEGNAME_NULL "NULL"
+#define SEGNAME_ZEROPAGE "ZEROPAGE"
+#define SEGNAME_DATA "DATA"
+#define SEGNAME_BSS "BSS"
+#define SEGNAME_RODATA "RODATA"
+#define SEGNAME_CODE "CODE"
+
+
+
+/*****************************************************************************/
+/* Code */
+/*****************************************************************************/
+
+
+
+/* End of segnames.h */
+
+#endif
+
+
+