fix: Link error on Windows due to shared symbols (#1918)

After reduction of shared dependencies in #1890, there is an unresolved
OSLCompiler constructor symbol when linking liboslexec. Avoid including
the oslcomp_pvt.h header that causes this.

Signed-off-by: Brecht Van Lommel <[email protected]>

Author: brechtvl

src/liboslcomp/symtab.cpp

@@ -5,7 +5,8 @@
 #include <string>
 #include <vector>
 
-#include "oslcomp_pvt.h"
+#include "osl_pvt.h"
+#include "symtab.h"
 
 #include <OpenImageIO/strutil.h>
 namespace Strutil = OIIO::Strutil;

src/liboslexec/batched_llvm_instance.cpp

@@ -27,7 +27,6 @@
 #include <llvm/IR/Constant.h>
 #include <llvm/IR/DerivedTypes.h>
 
-#include "../liboslcomp/oslcomp_pvt.h"
 #include "batched_backendllvm.h"
 #include "oslexec_pvt.h"
 

src/liboslexec/llvm_instance.cpp

@@ -18,7 +18,6 @@
 #include <OpenImageIO/sysutil.h>
 #include <OpenImageIO/timer.h>
 
-#include "../liboslcomp/oslcomp_pvt.h"
 #include "oslexec_pvt.h"
 #include "backendllvm.h"
 

src/liboslexec/master.cpp

@@ -11,7 +11,6 @@
 #include <OpenImageIO/strutil.h>
 #include <OpenImageIO/thread.h>
 
-#include "../liboslcomp/oslcomp_pvt.h"
 #include "oslexec_pvt.h"
 
 

src/liboslexec/runtimeoptimize.cpp

@@ -10,7 +10,6 @@
 #include <OpenImageIO/thread.h>
 #include <OpenImageIO/timer.h>
 
-#include "../liboslcomp/oslcomp_pvt.h"
 #include "batched_analysis.h"
 #include "oslexec_pvt.h"
 #include "runtimeoptimize.h"