From kato-commits-return-663-apmail-incubator-kato-commits-archive=incubator.apache.org@incubator.apache.org Wed Sep 30 09:50:32 2009 Return-Path: Delivered-To: apmail-incubator-kato-commits-archive@minotaur.apache.org Received: (qmail 98042 invoked from network); 30 Sep 2009 09:50:32 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 30 Sep 2009 09:50:32 -0000 Received: (qmail 72938 invoked by uid 500); 30 Sep 2009 09:50:32 -0000 Delivered-To: apmail-incubator-kato-commits-archive@incubator.apache.org Received: (qmail 72917 invoked by uid 500); 30 Sep 2009 09:50:32 -0000 Mailing-List: contact kato-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: kato-dev@incubator.apache.org Delivered-To: mailing list kato-commits@incubator.apache.org Received: (qmail 72907 invoked by uid 99); 30 Sep 2009 09:50:32 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Sep 2009 09:50:32 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Sep 2009 09:50:29 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 75DC023888D7; Wed, 30 Sep 2009 09:50:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r820231 - in /incubator/kato/trunk/org.apache.kato/kato.native/kato.native.cjvmti/src/main/native: cjvmti.c include/cjvmti.h Date: Wed, 30 Sep 2009 09:50:08 -0000 To: kato-commits@incubator.apache.org From: monteith@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090930095008.75DC023888D7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: monteith Date: Wed Sep 30 09:50:07 2009 New Revision: 820231 URL: http://svn.apache.org/viewvc?rev=820231&view=rev Log: Fixup 64bit types for Linux. Modified: incubator/kato/trunk/org.apache.kato/kato.native/kato.native.cjvmti/src/main/native/cjvmti.c incubator/kato/trunk/org.apache.kato/kato.native/kato.native.cjvmti/src/main/native/include/cjvmti.h Modified: incubator/kato/trunk/org.apache.kato/kato.native/kato.native.cjvmti/src/main/native/cjvmti.c URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.native/kato.native.cjvmti/src/main/native/cjvmti.c?rev=820231&r1=820230&r2=820231&view=diff ============================================================================== --- incubator/kato/trunk/org.apache.kato/kato.native/kato.native.cjvmti/src/main/native/cjvmti.c (original) +++ incubator/kato/trunk/org.apache.kato/kato.native/kato.native.cjvmti/src/main/native/cjvmti.c Wed Sep 30 09:50:07 2009 @@ -353,7 +353,7 @@ int initAgent(){ static int dumpCount; time_t creationTime; - __int64 longCreationTime; + INT64 longCreationTime; struct tm * dumpTime; char fileName[50]; int nameType = 0; // Switches between timestamping the file and not @@ -392,8 +392,8 @@ fwrite(&endianCheck, sizeof(int), 1, variableFile); fprintf(variableFile, "CJVMTI V0.01"); - longCreationTime = (_int64) creationTime; // Ensure that time is written as a long long. - fwrite(&longCreationTime, sizeof(_int64), 1, variableFile); + longCreationTime = (INT64) creationTime; // Ensure that time is written as a long long. + fwrite(&longCreationTime, sizeof(INT64), 1, variableFile); dumpCount++; return 1; } Modified: incubator/kato/trunk/org.apache.kato/kato.native/kato.native.cjvmti/src/main/native/include/cjvmti.h URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.native/kato.native.cjvmti/src/main/native/include/cjvmti.h?rev=820231&r1=820230&r2=820231&view=diff ============================================================================== --- incubator/kato/trunk/org.apache.kato/kato.native/kato.native.cjvmti/src/main/native/include/cjvmti.h (original) +++ incubator/kato/trunk/org.apache.kato/kato.native/kato.native.cjvmti/src/main/native/include/cjvmti.h Wed Sep 30 09:50:07 2009 @@ -43,6 +43,9 @@ #define FTELL(x) ftello((x)) #define FGETPOS(x,y) (*(y))=ftello((x)) #define FSETPOS(x,y) fseeko((x), (*(y)), SEEK_SET) +#include + +typedef int64_t INT64; #elif __aix__ #define FPOS_T off_t #define FSEEK(x,y,z) fseeko((x),(y),(z)) @@ -59,7 +62,7 @@ /* Prototypes for 64 bit functions */ extern __int64 _ftelli64(FILE *stream); extern int _fseeki64(FILE *stream, __int64 offset, int origin); - +typedef _int64 INT64; #else #error "unable to compile on this platform" #endif