Changeset 3072

Show
Ignore:
Timestamp:
12/05/07 21:25:34
Author:
pvanhoof
Message:

Revert incorrect merge junk

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/configure.ac

    r3070 r3072  
    439439                        AC_DEFINE_UNQUOTED(MAEMO_CONIC_DUMMY,1,["Whether to hack the TnyMaemoConicDevice to somewhat work in sbox"]) 
    440440                fi 
    441                 AC_DEFINE_UNQUOTED(MAEMO_HAVE_CONIC,1,["whether libconic is available"]) 
     441        else 
     442                AC_DEFINE_UNQUOTED(LIBTINYMAIL_MAEMO_WITHOUT_CONIC,1,["whether the dummy libconic should be built"]) 
    442443        fi 
    443444 
  • trunk/libtinymail-maemo/tny-maemo-conic-device.h

    r3070 r3072  
    3434 */ 
    3535 
    36 #ifdef MAEMO_HAVE_CONIC 
    37 #include <coniciap.h> 
    38 #else 
     36#ifdef LIBTINYMAIL_MAEMO_WITHOUT_CONIC 
    3937typedef struct { 
    4038} ConIcIap; 
    41 #endif /*MAEMO_HAVE_CONIC*/ 
     39#else 
     40#include <coniciap.h> 
     41#endif /*LIBTINYMAIL_MAEMO_WITHOUT_CONIC*/ 
    4242 
    4343G_BEGIN_DECLS