summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fitsy/file.C7
-rw-r--r--fitsy/file.h1
-rw-r--r--util/util.C11
-rw-r--r--util/util.h2
4 files changed, 12 insertions, 9 deletions
diff --git a/fitsy/file.C b/fitsy/file.C
index 4fe69ff..5f87a47 100644
--- a/fitsy/file.C
+++ b/fitsy/file.C
@@ -84,13 +84,6 @@ void envierror(FitsFile* envi, enviFlexLexer* ll, const char* m)
envi->error(cmd);
}
-void internalError(const char* msg)
-{
- extern Tcl_Interp *global_interp;
- Tcl_SetVar2(global_interp, "ds9", "msg", msg, TCL_GLOBAL_ONLY);
- Tcl_SetVar2(global_interp, "ds9", "msg,level", "error", TCL_GLOBAL_ONLY);
-}
-
FitsFile::FitsFile()
{
primary_ = NULL;
diff --git a/fitsy/file.h b/fitsy/file.h
index 09d1c8b..a8cfc46 100644
--- a/fitsy/file.h
+++ b/fitsy/file.h
@@ -13,7 +13,6 @@
extern int DebugGZ;
extern int DebugCompress;
-extern void internalError(const char*);
class OutFitsStream;
diff --git a/util/util.C b/util/util.C
index 1abc0e1..f84a309 100644
--- a/util/util.C
+++ b/util/util.C
@@ -7,9 +7,16 @@
#include <iomanip>
using namespace std;
+#include <tcl.h>
+
#include "util.h"
-static char tobuf[1024];
+void internalError(const char* msg)
+{
+ extern Tcl_Interp *global_interp;
+ Tcl_SetVar2(global_interp, "ds9", "msg", msg, TCL_GLOBAL_ONLY);
+ Tcl_SetVar2(global_interp, "ds9", "msg,level", "error", TCL_GLOBAL_ONLY);
+}
void swap2(char* src, char* dest) {
*(dest ) = *(src+1);
@@ -89,6 +96,8 @@ char* toUpper(const char* str)
return rr;
}
+static char tobuf[1024];
+
char* toConstLower(const char* str)
{
strncpy(tobuf,str,1024);
diff --git a/util/util.h b/util/util.h
index fcbdb98..1e93fb2 100644
--- a/util/util.h
+++ b/util/util.h
@@ -7,6 +7,8 @@
extern int lsb();
+extern void internalError(const char*);
+
extern void swap2(char* src, char* dest);
extern void swap4(char* src, char* dest);
extern void swap8(char* src, char* dest);