From b03829b88eea51199fea457402ebe4c994878990 Mon Sep 17 00:00:00 2001
From: relnev <relnev@icculus.org>
Date: Sat, 22 Jun 2002 23:57:39 +0000
Subject: [PATCH] remove writable strings.

fix compile for intel compiler.
---
 Makefile                    | 2 +-
 src/cfile/cfilesystem.cpp   | 7 +++++++
 src/starfield/starfield.cpp | 7 ++++++-
 src/vcodec/codec1.cpp       | 4 ++--
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 563b5ff..b023ef8 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ RANLIB=ranlib
 CODE_BINARY=code.a
 FS_BINARY=freespace2
 LDFLAGS=$(shell sdl-config --libs) -lopenal
-CFLAGS=-Wall -g -DPLAT_UNIX $(shell sdl-config --cflags) -Iinclude/ -fwritable-strings
+CFLAGS=-Wall -g -DPLAT_UNIX $(shell sdl-config --cflags) -Iinclude/ # -fwritable-strings
 #CFLAGS+=-O2
 #CFLAGS+=-DNDEBUG
 #CFLAGS+=-funroll-loops # -fomit-frame-pointer # not stable?
diff --git a/src/cfile/cfilesystem.cpp b/src/cfile/cfilesystem.cpp
index 005a015..08d03b9 100644
--- a/src/cfile/cfilesystem.cpp
+++ b/src/cfile/cfilesystem.cpp
@@ -19,6 +19,11 @@
  * all those locations, inherently enforcing precedence orders.
  *
  * $Log$
+ * Revision 1.7  2002/06/22 23:57:39  relnev
+ * remove writable strings.
+ *
+ * fix compile for intel compiler.
+ *
  * Revision 1.6  2002/06/09 04:41:15  relnev
  * added copyright header
  *
@@ -767,9 +772,11 @@ void cf_build_secondary_filelist(char *cdrom_dir)
 	// Init the path types
 	for (i=0; i<CF_MAX_PATH_TYPES; i++ )	{
 		Assert( Pathtypes[i].index == i );
+#if 0 /* they are already lowercased -- SBF */
 		if ( Pathtypes[i].extensions )	{
 			strlwr(Pathtypes[i].extensions);
 		}
+#endif		
 	}
 	
 	// Init the root blocks
diff --git a/src/starfield/starfield.cpp b/src/starfield/starfield.cpp
index 2b367f2..cf13d07 100644
--- a/src/starfield/starfield.cpp
+++ b/src/starfield/starfield.cpp
@@ -16,6 +16,11 @@
  * debris, etc.
  *
  * $Log$
+ * Revision 1.6  2002/06/22 23:57:39  relnev
+ * remove writable strings.
+ *
+ * fix compile for intel compiler.
+ *
  * Revision 1.5  2002/06/17 06:33:11  relnev
  * ryan's struct patch for gcc 2.95
  *
@@ -243,7 +248,7 @@
 typedef struct debris_vclip {
 	int	bm;
 	int	nframes;
-	char  *name;
+	char  name[32];
 } debris_vclip;
 
 typedef struct {
diff --git a/src/vcodec/codec1.cpp b/src/vcodec/codec1.cpp
index df7e9f9..976f94d 100644
--- a/src/vcodec/codec1.cpp
+++ b/src/vcodec/codec1.cpp
@@ -446,7 +446,7 @@ int Encode(t_Sample* bufIn, t_Sample* bufOut, int sizeIn, int sizeOut,
 // theoretically evil but is not really all that dangerous in practice...
 
 // disable compiler padding of structures
-#ifndef PLAT_UNIX
+#if !defined(PLAT_UNIX) || defined(__INTEL_COMPILER)
 #pragma pack(push, packet_declarations)
 #pragma pack(1)
 #define PACKED
@@ -549,7 +549,7 @@ struct t_PacketMF0
 } PACKED;
 
 // restore state of compiler padding of structures
-#ifndef PLAT_UNIX
+#if !defined(PLAT_UNIX) || defined(__INTEL_COMPILER)
 #pragma pack(pop, packet_declarations)
 #endif
 #undef PACKED
-- 
2.39.2