[xiph-commits] r8706 - trunk/oggdsf/src/lib/codecs/cmml/libCMMLParse

ozone at motherfish-iii.xiph.org ozone at motherfish-iii.xiph.org
Sun Jan 9 15:32:13 PST 2005


Author: ozone
Date: 2005-01-09 15:32:12 -0800 (Sun, 09 Jan 2005)
New Revision: 8706

Modified:
   trunk/oggdsf/src/lib/codecs/cmml/libCMMLParse/libCMMLParse.h
   trunk/oggdsf/src/lib/codecs/cmml/libCMMLParse/stdafx.h
Log:
oggdsf:
 * Portability fixes for libCMMLParse



Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLParse/libCMMLParse.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLParse/libCMMLParse.h	2005-01-09 23:27:43 UTC (rev 8705)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLParse/libCMMLParse.h	2005-01-09 23:32:12 UTC (rev 8706)
@@ -1,11 +1,13 @@
-// The following ifdef block is the standard way of creating macros which make exporting 
-// from a DLL simpler. All files within this DLL are compiled with the LIBCMMLPARSE_EXPORTS
-// symbol defined on the command line. this symbol should not be defined on any project
-// that uses this DLL. This way any other project whose source files include this file see 
-// LIBCMMLPARSE_API functions as being imported from a DLL, whereas this DLL sees symbols
-// defined with this macro as being exported.
-#ifdef LIBCMMLPARSE_EXPORTS
-#define LIBCMMLPARSE_API __declspec(dllexport)
+#pragma once
+
+
+#ifdef WIN32
+# ifdef LIBCMMLPARSE_EXPORTS
+#  define LIBCMMLPARSE_API __declspec(dllexport)
+# else
+#  define LIBCMMLPARSE_API __declspec(dllimport)
+# endif
 #else
-#define LIBCMMLPARSE_API __declspec(dllimport)
+# define LIBCMMLPARSE_API
 #endif
+

Modified: trunk/oggdsf/src/lib/codecs/cmml/libCMMLParse/stdafx.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/cmml/libCMMLParse/stdafx.h	2005-01-09 23:27:43 UTC (rev 8705)
+++ trunk/oggdsf/src/lib/codecs/cmml/libCMMLParse/stdafx.h	2005-01-09 23:32:12 UTC (rev 8706)
@@ -8,6 +8,8 @@
 
 #define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
 // Windows Header Files:
-#include <windows.h>
+#ifdef WIN32
+# include <windows.h>
+#endif
 
 // TODO: reference additional headers your program requires here



More information about the commits mailing list