Try this AGAIN. Move ap_regkey.h to include/ and assure that this time,

  it contains defined(WIN32)||defined(DOXYGEN) requirements to prevent the
  other platform exports from barfing.  Please ack if this works for you.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96019 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/os/win32/ap_regkey.h b/include/ap_regkey.h
similarity index 99%
rename from os/win32/ap_regkey.h
rename to include/ap_regkey.h
index 8f47e3f471259e017eace68803d99e63c62e9b09..4b9c7bc52a51575d195c01e39b5b66b6a0186d1a 100644 (file)
--- a/os/win32/ap_regkey.h
+++ b/include/ap_regkey.h
@@ -59,12 +59,12 @@
 #ifndef AP_REGKEY_H
 #define AP_REGKEY_H
 
+#if defined(WIN32) || defined(DOXYGEN)
+
 #include "apr.h"
 #include "apr_pools.h"
 #include "ap_config.h"      /* Just for AP_DECLARE */
 
-#if defined(WIN32) || defined(DOXYGEN)
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -258,5 +258,7 @@ AP_DECLARE(apr_status_t) ap_regkey_value_remove(const ap_regkey_t *key,
 #ifdef __cplusplus
 }
 #endif
-#endif /* WIN32 || DOXYGEN */
+
+#endif /* def WIN32 || def DOXYGEN */
+
 #endif /* AP_REGKEY_H */

diff --git a/libhttpd.dsp b/libhttpd.dsp
index f450b18a48ae070dc7347f5ab864084f879af3ef..8495b4157222196bb54c270281e9fa901c929751 100644 (file)
--- a/libhttpd.dsp
+++ b/libhttpd.dsp
@@ -100,6 +100,10 @@ SOURCE=.\include\ap_mmn.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\include\ap_regkey.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\include\ap_release.h
 # End Source File
 # Begin Source File
@@ -192,35 +196,6 @@ SOURCE=.\server\vhost.c
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\os\win32\ap_regkey.h
-
-!IF  "$(CFG)" == "libhttpd - Win32 Release"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating include/ap_regkey.h
-InputPath=.\os\win32\ap_regkey.h
-
-".\include\ap_regkey.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       type .\os\win32\ap_regkey.h > .\include\ap_regkey.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "libhttpd - Win32 Debug"
-
-# PROP Ignore_Default_Tool 1
-# Begin Custom Build - Creating include/ap_regkey.h
-InputPath=.\os\win32\ap_regkey.h
-
-".\include\ap_regkey.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       type .\os\win32\ap_regkey.h > .\include\ap_regkey.h
-
-# End Custom Build
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
 SOURCE=.\server\gen_test_char.exe
 USERDEP__GEN_T=".\include\os.h"