***************
*** 28,38 ****
  	*dyn_BINDIR,
  	*dyn_SWATDIR;
  
  extern pstring dyn_CONFIGFILE;
  extern pstring dyn_LOGFILEBASE, dyn_LMHOSTSFILE;
- extern pstring dyn_LIBDIR;
- extern fstring dyn_SHLIBEXT;
  extern pstring dyn_LOCKDIR;
  extern pstring dyn_PIDDIR;
  extern pstring dyn_SMB_PASSWD_FILE;
  extern pstring dyn_PRIVATE_DIR;
--- 28,49 ----
  	*dyn_BINDIR,
  	*dyn_SWATDIR;
  
+ #ifdef __OS2__
+ #define dyn_CONFIGFILE (getconfigfile())
+ #define dyn_LOGFILEBASE (getlogbase())
+ #define dyn_LOCKDIR (getlockdir())
+ #define dyn_PIDDIR (getpiddir())
+ #define dyn_PRIVATE_DIR (getprivatedir())
+ #define dyn_SMB_PASSWD_FILE (getsmbpasswd())
+ #define dyn_LMHOSTSFILE (getlmhosts())
+ #else
  extern pstring dyn_CONFIGFILE;
  extern pstring dyn_LOGFILEBASE, dyn_LMHOSTSFILE;
  extern pstring dyn_LOCKDIR;
  extern pstring dyn_PIDDIR;
  extern pstring dyn_SMB_PASSWD_FILE;
  extern pstring dyn_PRIVATE_DIR;
+ #endif /* __OS2__ */
+ extern fstring dyn_SHLIBEXT;
+ extern pstring dyn_LIBDIR;
+