diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-11-23 12:28:39 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-11-23 12:28:39 +0000 |
| commit | d706f1381834f2edb0fc2f9fbe9c7fa45ccc34d1 (patch) | |
| tree | 873603ea61d4f6b215e6c9ca0ade617e2a24ca06 | |
| parent | 5b25b88068d28b1f6c04f0d3d8768b224000afa2 (diff) | |
| download | ATCD-d706f1381834f2edb0fc2f9fbe9c7fa45ccc34d1.tar.gz | |
Fri Nov 23 12:28:20 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/Service_Config.h:
msvc fix
| -rw-r--r-- | ACE/ChangeLog | 5 | ||||
| -rw-r--r-- | ACE/ace/Service_Config.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 83d6b313c2d..02d0072cb5b 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,8 @@ +Fri Nov 23 12:28:20 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Service_Config.h: + msvc fix + Fri Nov 23 12:19:09 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> * debian/libace-dev.docs: diff --git a/ACE/ace/Service_Config.h b/ACE/ace/Service_Config.h index a8616c419f8..4f31be9f7dd 100644 --- a/ACE/ace/Service_Config.h +++ b/ACE/ace/Service_Config.h @@ -57,7 +57,7 @@ class ACE_DLL; ACE_TEXT ("() \"") \ ACE_TEXT (parameters) \ ACE_TEXT ("\"") -#if defined (ACE_VERSIONED_SO) and (ACE_VERSIONED_SO == 2) +#if defined (ACE_VERSIONED_SO) && (ACE_VERSIONED_SO == 2) #define ACE_DYNAMIC_VERSIONED_SERVICE_DIRECTIVE(ident, libpathname, version, objectclass, parameters) \ ACE_TEXT ("dynamic ") \ ACE_TEXT (ident) \ |