1 diff -Naur omniNotify-orig/include/RDIstrstream.h omniNotify/include/RDIstrstream.h
2 --- omniNotify/include/RDIstrstream.h 2003-10-12 22:51:15.000000000 +0400
3 +++ omniNotify/include/RDIstrstream.h 2006-09-28 17:44:20.000000000 +0400
5 RDIstrstream& operator<<(const void *p);
6 RDIstrstream& operator<<(int n);
7 RDIstrstream& operator<<(unsigned int n);
9 RDIstrstream& operator<<(long n);
10 RDIstrstream& operator<<(unsigned long n);
12 RDIstrstream& operator<<(short n) {return operator<<((int)n);}
13 RDIstrstream& operator<<(unsigned short n) {return operator<<((unsigned int)n);}
15 diff -Naur omniNotify-orig/include/RDITimeWrappers.h omniNotify/include/RDITimeWrappers.h
16 --- omniNotify/include/RDITimeWrappers.h 2003-10-23 17:28:18.000000000 +0400
17 +++ omniNotify/include/RDITimeWrappers.h 2006-09-28 18:10:41.000000000 +0400
19 // pretty-printing of absolute local time -- no newline
20 void out_local(RDIstrstream& str) {
22 - get_posixbase_secs_nanosecs(ts, tn);
23 - RDI_posixbase_out_time(str, ts, tn);
24 + unsigned long ts3, tn3;
25 + get_posixbase_secs_nanosecs(ts3, tn3);
26 + RDI_posixbase_out_time(str, ts3, tn3);
27 + ts = (CORBA::ULong)ts3;
28 + tn = (CORBA::ULong)tn3;
29 str << " (local time)";
33 // pretty-printing of absolute univ time -- no newline
34 void out_gmt(RDIstrstream& str) {
36 - get_gmt_posixbase_secs_nanosecs(ts, tn);
37 - RDI_posixbase_out_time(str, ts, tn);
38 + unsigned long ts4, tn4;
39 + get_gmt_posixbase_secs_nanosecs(ts4, tn4);
40 + RDI_posixbase_out_time(str, ts4, tn4);
41 + ts = (CORBA::ULong)ts4;
42 + tn = (CORBA::ULong)tn4;
43 str << " (greenwich mean time)";
45 // static helpers for producing TimeBase::UtcT min and max
46 diff -Naur omniNotify-orig/lib/RDIstrstream.cc omniNotify/lib/RDIstrstream.cc
47 --- omniNotify/lib/RDIstrstream.cc 2003-10-23 08:39:12.000000000 +0400
48 +++ omniNotify/lib/RDIstrstream.cc 2006-09-28 16:56:03.000000000 +0400
55 RDIstrstream::operator<<(long n)
65 diff -Naur omniNotify-orig/lib/RDITimeWrappers.cc omniNotify/lib/RDITimeWrappers.cc
66 --- omniNotify/lib/RDITimeWrappers.cc 2003-10-23 08:39:12.000000000 +0400
67 +++ omniNotify/lib/RDITimeWrappers.cc 2006-09-28 16:56:09.000000000 +0400
69 #define WHATFN "RDI_TimeT::fmt_local"
70 const char *RDI_TimeT::fmt_local() {
72 - get_posixbase_secs_msecs(ts, tm);
73 + unsigned long ts2, tm2;
74 + get_posixbase_secs_msecs(ts2, tm2);
75 + ts = (CORBA::ULong)ts2;
76 + tm = (CORBA::ULong)tm2;
77 time_t secs_as_time_t = ts;
78 TW_SCOPE_LOCK(otime_lock, RDI_out_time_lock, "RDI_out_time", WHATFN);
79 RDI_TimeT_fmt_local_buf_idx = (RDI_TimeT_fmt_local_buf_idx + 1) % 10;
80 diff -Naur omniNotify/mk/beforeauto.mk.in omniNotify/mk/beforeauto.mk.in
81 --- omniNotify/mk/beforeauto.mk.in 2003-10-29 22:18:36.000000000 +0300
82 +++ omniNotify/mk/beforeauto.mk.in 2006-10-13 16:58:26.000000000 +0400
85 CPPFLAGS = $(DIR_CPPFLAGS) $(IMPORT_CPPFLAGS)
87 -CFLAGS = $(CDEBUGFLAGS) $(COPTIONS) $(CPPFLAGS)
88 +CFLAGS = -m64 $(CDEBUGFLAGS) $(COPTIONS) $(CPPFLAGS)
90 -CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(CPPFLAGS)
91 +CXXFLAGS = -m64 $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(CPPFLAGS)
94 #############################################################################