[Teem-commit] SF.net SVN: teem:[4405] teem/trunk/src/meet

[<kin...@us...>]

Revision: 4405
          http://teem.svn.sourceforge.net/teem/?rev=4405&view=rev
Author:   kindlmann
Date:     2009-11-20 05:10:20 +0000 (Fri, 20 Nov 2009)

Log Message:
-----------
moving pull out of TEEM_BUILD_EXPERIMENTAL_LIBS control

Modified Paths:
--------------
    teem/trunk/src/meet/meet.h
    teem/trunk/src/meet/meetPull.c

Modified: teem/trunk/src/meet/meet.h
===================================================================
--- teem/trunk/src/meet/meet.h	2009-11-19 21:17:39 UTC (rev 4404)
+++ teem/trunk/src/meet/meet.h	2009-11-20 05:10:20 UTC (rev 4405)
@@ -34,12 +34,12 @@
 #include <teem/unrrdu.h>
 #include <teem/dye.h>
 #if defined(TEEM_BUILD_EXPERIMENTAL_LIBS)
-#include <teem/moss.h>
-#include <teem/alan.h>
+#  include <teem/moss.h>
+#  include <teem/alan.h>
 #endif
 #include <teem/gage.h>
 #if defined(TEEM_BUILD_EXPERIMENTAL_LIBS)
-#include <teem/bane.h>
+#  include <teem/bane.h>
 #endif
 #include <teem/limn.h>
 #include <teem/seek.h>
@@ -48,10 +48,10 @@
 #include <teem/ten.h>
 #include <teem/mite.h>
 #if defined(TEEM_BUILD_EXPERIMENTAL_LIBS)
-#include <teem/coil.h>
-#include <teem/push.h>
-#include <teem/pull.h>
+#  include <teem/coil.h>
+#  include <teem/push.h>
 #endif
+#include <teem/pull.h>
 
 #if defined(_WIN32) && !defined(__CYGWIN__) && !defined(TEEM_STATIC)
 #  if defined(TEEM_BUILD) || defined(meet_EXPORTS) || defined(teem_EXPORTS)
@@ -81,7 +81,6 @@
 MEET_EXPORT hestCB *meetHestGageKind;
 MEET_EXPORT hestCB *meetHestConstGageKind;
 
-#if defined(TEEM_BUILD_EXPERIMENTAL_LIBS)
 /*
 ******** meetPullVol
 **
@@ -156,7 +155,6 @@
                                      meetPullInfo **minf,
                                      unsigned int minfNum);
 
-#endif
 
 #ifdef __cplusplus
 }

Modified: teem/trunk/src/meet/meetPull.c
===================================================================
--- teem/trunk/src/meet/meetPull.c	2009-11-19 21:17:39 UTC (rev 4404)
+++ teem/trunk/src/meet/meetPull.c	2009-11-20 05:10:20 UTC (rev 4405)
@@ -22,15 +22,6 @@
 
 #include "meet.h"
 
-#if !defined(TEEM_BUILD_EXPERIMENTAL_LIBS)
-/* have something to avoid "no symbols" warnings */
-void*
-meetPullVolNew(void) {
-  return NULL;
-}
-
-#else /* TEEM_BUILD_EXPERIMENTAL_LIBS */
-
 meetPullVol *
 meetPullVolNew(void) {
   meetPullVol *ret;
@@ -52,7 +43,6 @@
   return ret;
 }
 
-
 /*
 ******** meetPullVolParse
 **
@@ -605,6 +595,3 @@
   airMopOkay(mop);
   return 0;
 }
-
-
-#endif /* TEEM_BUILD_EXPERIMENTAL_LIBS */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.