aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjshalf <jshalf@bfcf8e34-485d-4d46-a995-1fd6fa6fb178>2000-10-08 05:49:27 +0000
committerjshalf <jshalf@bfcf8e34-485d-4d46-a995-1fd6fa6fb178>2000-10-08 05:49:27 +0000
commit749d477a67a3d9b8a314d62030c646606f1a001f (patch)
tree8c8182e67296a6bf7f57c8cc064b110bc4be12df
parent0544d752403aedf035e7ccd3ac9bccf8410877d2 (diff)
OK,
with cvs update and -config, we now understand CCTK_INT8. Un-doing changes which removed the CCTK_INT8 from the sockets. git-svn-id: http://svn.cactuscode.org/arrangements/CactusPUGHIO/IsoSurfacer/trunk@9 bfcf8e34-485d-4d46-a995-1fd6fa6fb178
-rw-r--r--src/IsoSurfacer.c4
-rw-r--r--src/Sockets.c7
2 files changed, 6 insertions, 5 deletions
diff --git a/src/IsoSurfacer.c b/src/IsoSurfacer.c
index dd50173..2950949 100644
--- a/src/IsoSurfacer.c
+++ b/src/IsoSurfacer.c
@@ -372,9 +372,9 @@ void CollectData(cGH *GH, polypatch *perprocessor, polypatch *totals) {
/**************************************************************/
int IsoWriteDataToClients(char *metadata,
- CCTK_INT4 size,
+ CCTK_INT8 size,
IsoType type,
- CCTK_INT4 *data);
+ void *data);
void WriteSock(cGH *GH, polypatch *totals, isosurfacerGH *myGH,
const char *fullname, int isoindex,
diff --git a/src/Sockets.c b/src/Sockets.c
index 9d8afb8..2d36b02 100644
--- a/src/Sockets.c
+++ b/src/Sockets.c
@@ -81,7 +81,7 @@ typedef struct ISOSocket
isoSocketState state;
} isoSocket;
-/********************************************************************
+/*******************************************************************
********************* Local Routine Prototypes *********************
********************************************************************/
@@ -326,10 +326,11 @@ int Iso_Poll(cGH *cctkGH, long sec, long usec)
}
int IsoWriteDataToClients(const char *metadata,
- CCTK_INT4 size,
+ CCTK_INT8 size,
IsoType type,
- CCTK_INT4 *data)
+ void *dataP)
{
+ CCTK_INT4 *data=(CCTK_INT4*)dataP;
int retval;
CCTK_INT4 i;
CCTK_INT4 datatype;