aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgoodale <goodale@eff87b29-5268-4891-90a3-a07138403961>2000-10-29 21:36:03 +0000
committergoodale <goodale@eff87b29-5268-4891-90a3-a07138403961>2000-10-29 21:36:03 +0000
commitb0d1544724657ceea4085b29c8a0a911f1afeade (patch)
tree560e79e73c29c87ea7aaede8e9dacf1c3bc2e77b
parent86626af0009e82ee413d21d62dc7df18696f3bc9 (diff)
Getting rid of a couple of warnings.
Tom git-svn-id: http://svn.cactuscode.org/arrangements/CactusIO/IOJpeg/trunk@27 eff87b29-5268-4891-90a3-a07138403961
-rw-r--r--src/JPEG.c2
-rw-r--r--src/Output2D.c33
-rw-r--r--src/Write2D.c2
3 files changed, 19 insertions, 18 deletions
diff --git a/src/JPEG.c b/src/JPEG.c
index 990d9d1..5785906 100644
--- a/src/JPEG.c
+++ b/src/JPEG.c
@@ -5,6 +5,8 @@
#include <string.h>
#include <math.h>
+#include "IOJpeg.h"
+
#include "external/jpeg6b/src/jconfig.h"
#include "external/jpeg6b/src/jpeglib.h"
diff --git a/src/Output2D.c b/src/Output2D.c
index 1bd6ad0..887e333 100644
--- a/src/Output2D.c
+++ b/src/Output2D.c
@@ -1,24 +1,9 @@
-
- /*@@
- @routine IOJpeg_Output2DGH
- @date Thu Sep 14 10:47:58 2000
- @author Gerd Lanfermann
- @desc
- Preparing 2D data for output
- @enddesc
- @calls
- @calledby
- @history
-
- @endhistory
-
-@@*/
-
+#include "cctk.h"
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
-#include "cctk.h"
#include "cctk_Parameters.h"
#include "CactusBase/IOUtil/src/ioutil_Utils.h"
#include "IOJpeg.h"
@@ -32,6 +17,20 @@ static void CheckSteerableParameters (IOJpegGH *myGH);
static void SetOutputFlag (int index, const char *optstring, void *arg);
+ /*@@
+ @routine IOJpeg_Output2DGH
+ @date Thu Sep 14 10:47:58 2000
+ @author Gerd Lanfermann
+ @desc
+ Preparing 2D data for output
+ @enddesc
+ @calls
+ @calledby
+ @history
+
+ @endhistory
+
+@@*/
int IOJpeg_Output2DGH (cGH *GH)
{
DECLARE_CCTK_PARAMETERS
diff --git a/src/Write2D.c b/src/Write2D.c
index f9fb858..457704f 100644
--- a/src/Write2D.c
+++ b/src/Write2D.c
@@ -12,7 +12,7 @@
#include <stdio.h>
#include <stdlib.h>
-
+#include <string.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>