diff options
| author | jai <jai@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-05-15 23:02:31 +0000 |
|---|---|---|
| committer | jai <jai@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-05-15 23:02:31 +0000 |
| commit | 18e134c5c98a14962a3b7d5e69a6615b888fa652 (patch) | |
| tree | 6a4d4b0590cd3e1f09030c3f3ed0d861effd70c2 | |
| parent | bb47c0364d38ffeeaf2114b56518985aae01a3d9 (diff) | |
| download | ATCD-18e134c5c98a14962a3b7d5e69a6615b888fa652.tar.gz | |
Wed May 15 15:59:42 2002 Jaiganesh Balasubramanian <jai@doc.ece.uci.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Event/rtcorba_event_export.h | 12 |
2 files changed, 15 insertions, 3 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 4f108ee6218..1b30ec59cb2 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,8 @@ +Wed May 15 15:59:42 2002 Jaiganesh Balasubramanian <jai@doc.ece.uci.edu> + + * orbsvcs/orbsvcs/Event/rtcorba_event_export.h: + MOdified the export file to fix the Winxp build errors. + Wed May 15 15:44:54 2002 Ossama Othman <ossama@uci.edu> * TAO_IDL/be/be_visitor_interface/interface_sh.cpp @@ -31,6 +36,7 @@ Wed May 15 15:20:15 2002 Jeff Parsons <parsons@cs.wustl.edu> before it was returned. Thanks to Craig Rodrigues <crodrigu@bbn.com> for reporting the bug. +>>>>>>> 1.5549 Wed May 15 11:26:15 2002 Priyanka Gontla <pgontla@ece.uci.edu> * orbsvcs/tests/Security/Big_Request/Makefile: diff --git a/TAO/orbsvcs/orbsvcs/Event/rtcorba_event_export.h b/TAO/orbsvcs/orbsvcs/Event/rtcorba_event_export.h index 874ad7899fb..e2af98341c2 100644 --- a/TAO/orbsvcs/orbsvcs/Event/rtcorba_event_export.h +++ b/TAO/orbsvcs/orbsvcs/Event/rtcorba_event_export.h @@ -9,9 +9,15 @@ #include "ace/config-all.h" -#if !defined (TAO_RTCORBAEVENT_HAS_DLL) -# define TAO_RTCORBAEVENT_HAS_DLL 1 -#endif /* ! TAO_RTCORBAEVENT_HAS_DLL */ +#if defined (TAO_AS_STATIC_LIBS) +# if !defined (TAO_RTCORBAEVENT_HAS_DLL) +# define TAO_RTCORBAEVENT_HAS_DLL 0 +# endif /* ! TAO_RTCORBAEVENT_HAS_DLL */ +#else +# if !defined (TAO_RTCORBAEVENT_HAS_DLL) +# define TAO_RTCORBAEVENT_HAS_DLL 1 +# endif /* ! TAO_RTCORBAEVENT_HAS_DLL */ +#endif #if defined (TAO_RTCORBAEVENT_HAS_DLL) && (TAO_RTCORBAEVENT_HAS_DLL == 1) # if defined (TAO_RTCORBAEVENT_BUILD_DLL) |