cleanup

svn-id: r14053

4 files changed, 6 insertions, 9 deletions

diff --git a/saga/actor.cpp b/saga/actor.cpp
index 4a1fc66dae..5d627ad1a4 100644
--- a/saga/actor.cpp
+++ b/saga/actor.cpp
@@ -81,7 +81,7 @@ int ACTOR_Init() {
 	// Create actor lookup table
 	ActorModule.tbl = (YS_DL_NODE **)malloc(R_ACTORCOUNT * sizeof *ActorModule.tbl);
 	if (ActorModule.tbl == NULL) {
-		ActorModule.err_str = R_MEMFAIL_MSG;
+		ActorModule.err_str = "Memory allocation error.";
 		return R_MEM;
 	}
 
@@ -93,7 +93,7 @@ int ACTOR_Init() {
 	ActorModule.alias_tbl = (int *)malloc(R_ACTORCOUNT * sizeof *ActorModule.alias_tbl);
 	if (ActorModule.alias_tbl == NULL) {
 		free(ActorModule.tbl);
-		ActorModule.err_str = R_MEMFAIL_MSG;
+		ActorModule.err_str = "Memory allocation error.";
 		return R_MEM;
 	}
 
diff --git a/saga/reinherit.h b/saga/reinherit.h
index af5c1b9bef..cbec3ffd06 100644
--- a/saga/reinherit.h
+++ b/saga/reinherit.h
@@ -36,15 +36,13 @@ namespace Saga {
 
 #define R_MAXPATH 512
 
-#define R_MEMFAIL_MSG "Memory allocation error."
-
 // Define opaque types
 
 // r_rscfile
-typedef struct R_RSCFILE_CONTEXT_tag R_RSCFILE_CONTEXT;
+struct R_RSCFILE_CONTEXT;
 
 // r_script
-typedef struct R_SEMAPHORE_tag R_SEMAPHORE;
+struct R_SEMAPHORE;
 
 // Define common data types
 
@@ -64,7 +62,6 @@ struct R_SURFACE {
 	int buf_h;
 	int buf_pitch;
 	R_RECT clip_rect;
-	void *impl_src;
 };
 
 #define R_RGB_RED   0x00FF0000UL
diff --git a/saga/rscfile.h b/saga/rscfile.h
index 2f85ec10fe..431ad65072 100644
--- a/saga/rscfile.h
+++ b/saga/rscfile.h
@@ -41,7 +41,7 @@ struct R_RSCFILE_RESOURCE {
 	size_t res_size;
 };
 
-struct R_RSCFILE_CONTEXT_tag {
+struct R_RSCFILE_CONTEXT {
 	const char *rc_file_fspec;
 	File rc_file;
 	int rc_file_loaded;
diff --git a/saga/sthread.h b/saga/sthread.h
index 6eb7329870..80306503c1 100644
--- a/saga/sthread.h
+++ b/saga/sthread.h
@@ -32,7 +32,7 @@ namespace Saga {
 
 #define STHREAD_DEF_INSTR_COUNT 7
 
-struct R_SEMAPHORE_tag {
+struct R_SEMAPHORE {
 	int hold_count;
 };