← Back to branch summary

~ubuntu-branches/debian/wheezy/cuneiform/wheezy

« back to all changes in this revision

Viewing changes to cuneiform_src/Kern/hdebug/__snp.c

  • Committer: Bazaar Package Importer
  • Author(s): Jakub Wilk
  • Date: 2011-04-30 13:16:24 UTC
  • mfrom: (1.1.3 upstream) (5.1.2 experimental)
  • Revision ID: james.westby@ubuntu.com-20110430131624-6yqf92183p6hshur
Tags: 1.1.0+dfsg-1
http://bugs.debian.org/596917
* Upload to unstable.
* New upstream release.
  + Drop patches: c-assert.diff, cuneiform.h-rename-*.diff,
    slovenian-slv.diff, soname.diff, swabytes.diff. All applied upstream.
  + Refresh the remaining patches.
  + Update *.install files.
  + Fix incorrect use of va_list (closes: #596917).
* Re-add c-assert.diff to fix another instance of custom assert() macro.
* Use stricter check level for dpkg-gensymbols.
* Bump standards version to 3.9.2 (no changes needed).

Show diffs side-by-side

added added

removed removed

Lines of Context:
cuneiform_src/Kern/hdebug/__snp.c
374
374
                DrawRectTip(wnd,rc,skew,rgb_color,(int16_t)pen_width,key,pTip);
375
375
        }
376
376
        //////////////////////////////////////////////
377
 
        void LDPUMA_DeleteRects(Handle wnd, uint32_t key)
 
377
        void LDPUMA_DeleteRects(Handle wnd, intptr_t key)
378
378
        {
379
379
                if(DeleteRects)
380
380
                DeleteRects(wnd,key);
431
431
        int32_t LDPUMA_ConsoleN(const char * message,...)
432
432
        {
433
433
                int32_t rc = 0;
 
434
#ifdef WIN32
434
435
                if(Console)
435
436
                {
436
437
                        va_list marker;
439
440
                        va_end(marker);
440
441
                        LDPUMA_Console("\n");
441
442
                }
 
443
#endif
442
444
                return rc;
443
445
        }
444
446
        //////////////////////////////////////////////
446
448
        {
447
449
                if(StatusLine)
448
450
                {
449
 
                        va_list marker;
 
451
#ifdef WIN32
 
452
                    va_list marker;
450
453
                        va_start( marker, message);
451
454
                        StatusLine(message,marker);
452
455
                        va_end(marker);
 
456
#endif
453
457
                }
454
458
        }
455
459
        //////////////////////////////////////////////
457
461
        {
458
462
                if(MessageBoxOk)
459
463
                {
460
 
                        va_list marker;
 
464
#ifdef WIN32
 
465
                    va_list marker;
461
466
                        va_start( marker, message);
462
467
                        MessageBoxOk(message,marker);
463
468
                        va_end(marker);
 
469
#endif
464
470
                }
465
471
        };
466
472
        //////////////////////////////////////////////
469
475
                Bool16 rc = FALSE;
470
476
                if(MessageBoxYesNo)
471
477
                {
472
 
                        va_list marker;
 
478
#ifdef WIN32
 
479
                    va_list marker;
473
480
                        va_start( marker, message);
474
481
                        rc = MessageBoxYesNo(message,marker);
475
482
                        va_end(marker);
 
483
#endif
476
484
                }
477
485
                return rc;
478
486
        };
816
824
        Handle LDPUMA_TimeStamp(const char * name,Handle hTimer)
817
825
        {
818
826
                time_t ltime = 0;
819
 
                int clock1 = 0;
 
827
                intptr_t clock1 = 0;
820
828
                if(LDPUMA_IsActive())
821
829
                {
822
830
                        time( &ltime );
823
831
                        clock1=clock();
824
832
                        if(name==NULL)
825
 
                        name = "Time stamp";
 
833
                            name = "Time stamp";
826
834
                        if(hTimer==NULL)
827
 
                        LDPUMA_Console("%s : %s\n",name,asctime(localtime(&ltime)));
 
835
                            LDPUMA_Console("%s : %s\n",name,asctime(localtime(&ltime)));
828
836
                        else
829
837
                        {
830
 
                                int clockprev = (int)hTimer;
831
 
                                LDPUMA_Console("%s : %i msec.\n",name,clock1-clockprev);
 
838
                                long clockprev = (long)hTimer;
 
839
                                LDPUMA_Console("%s : %ld msec.\n",name,clock1-clockprev);
832
840
                        }
833
841
                }
834
842
                return (Handle) clock1;
890
898
        int32_t LDPUMA_FPrintf1024(Handle hFile,const char * lpFormat,...)
891
899
        {
892
900
                int32_t rc = 0;
 
901
#ifdef WIN32
893
902
                if(fFPrintf1024 && hFile)
894
903
                {
895
904
                        va_list marker;
897
906
                        rc = fFPrintf1024(hFile,lpFormat,marker);
898
907
                        va_end(marker);
899
908
                }
 
909
#endif
900
910
                return rc;
901
911
        }
902
912
        //////////////////////////////////////////////
989
999
        int SnpLog(const char * message,...)
990
1000
        {
991
1001
                int rc = 0;
 
1002
#ifdef WIN32
992
1003
                if(Console)
993
1004
                {
994
1005
                        va_list marker;
996
1007
                        rc = Console(message,marker);
997
1008
                        va_end(marker);
998
1009
                }
 
1010
#endif
999
1011
                return rc;
1000
1012
        }
1001
1013
        void SnpStatusLine(const char * message,...)
1002
1014
        {
 
1015
#ifdef WIN32
1003
1016
                if(StatusLine)
1004
1017
                {
1005
1018
                        va_list marker;
1007
1020
                        StatusLine(message,marker);
1008
1021
                        va_end(marker);
1009
1022
                }
 
1023
#endif
1010
1024
        }
1011
1025
        void SnpMessBoxOk( char * message )
1012
1026
        {